diff options
| author | Araq <rumpf_a@web.de> | 2014-10-20 08:44:00 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-10-20 08:44:00 +0200 |
| commit | 53a9d6f5cd199382957188cd8a1a7f0aa5035033 (patch) | |
| tree | 9873032461904538e21cbff3417882d1b54ef881 /doc/manual/syntax.txt | |
| parent | c7570dcd3e4202bd339a2ebbc09952a546c62269 (diff) | |
| parent | b0179f9af5c5ed3cc63c5cd3b9d1055b742a3b79 (diff) | |
| download | Nim-53a9d6f5cd199382957188cd8a1a7f0aa5035033.tar.gz | |
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
Diffstat (limited to 'doc/manual/syntax.txt')
0 files changed, 0 insertions, 0 deletions