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
This commit is contained in:
Araq 2014-10-20 08:44:00 +02:00
commit 53a9d6f5cd
24 changed files with 814 additions and 278 deletions

View file

@ -12,6 +12,7 @@ Nim Manual
user to one/some of the other players, but the total amount seems to remain
pretty much constant for a given task. -- Ran
.. include:: manual/about.txt
.. include:: manual/definitions.txt
.. include:: manual/lexing.txt