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:
commit
53a9d6f5cd
24 changed files with 814 additions and 278 deletions
|
|
@ -62,5 +62,5 @@ allowing you to create commercial applications.
|
|||
|
||||
Read copying.txt for more details.
|
||||
|
||||
Copyright (c) 2004-2014 Andreas Rumpf.
|
||||
Copyright (c) 2006-2014 Andreas Rumpf.
|
||||
All rights reserved.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue