Araq c7570dcd3e Merge branch 'devel' into bigbreak ...

Conflicts:
	compiler/ast.nim
	compiler/nimfix/prettybase.nim
	compiler/pragmas.nim
	compiler/sempass2.nim
	doc/manual.txt
	koch.nim
	lib/pure/concurrency/threadpool.nim
	web/news.txt

2014-10-13 08:26:24 +02:00

..

buildbat.tmpl

resolved conflicts with master

2014-01-18 01:16:45 +01:00

buildsh.tmpl

resolved conflicts with master

2014-01-18 01:16:45 +01:00

debcreation.nim

posix.nim compiles again

2014-08-29 01:28:48 +02:00

deinstall.tmpl

case consistency part 5

2013-12-28 00:37:45 +01:00

inno.tmpl

case consistency part 5

2013-12-28 00:37:45 +01:00

install.tmpl

case consistency part 5

2013-12-28 00:37:45 +01:00

niminst.nim

Merge branch 'devel' into bigbreak

2014-10-13 08:26:24 +02:00