Commit Graph

4 Commits

Author SHA1 Message Date
Araq
adad2d5f4a Merge branch 'devel' into bigbreak
Conflicts:
	lib/impure/db_postgres.nim
	lib/pure/json.nim
	lib/pure/math.nim
	lib/system/atomics.nim
2014-11-03 11:42:36 +01:00
Araq
53a9d6f5cd Merge branch 'devel' into bigbreak
Conflicts:
	compiler/nim.ini
	doc/manual.txt
	doc/tut2.txt
	koch.nim
	lib/system/channels.nim
	readme.txt
	tools/niminst/niminst.nim
	tools/nimweb.nim
	web/download.txt
	web/news.txt
2014-10-20 08:44:00 +02:00
Araq
a9a5766c66 docgen should work again 2014-10-05 03:06:19 +02:00
Araq
0f4567d59e koch now uses nim.exe 2014-08-29 02:23:40 +02:00