diff options
author | Araq <rumpf_a@web.de> | 2014-11-03 22:50:55 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-11-03 22:50:55 +0100 |
commit | a53e97fc892d8f2d5fc8b8abbdd7c25e4bb2f6cb (patch) | |
tree | 47f1f506408d2837e1ab5ab7f81c37f05a848706 /compiler/nim.ini | |
parent | 8853023fd8c0ecd241b22a674db62723f4bf0305 (diff) | |
parent | 0bfa26c2138201dce539efae594e7eef1a7f25a3 (diff) | |
download | Nim-a53e97fc892d8f2d5fc8b8abbdd7c25e4bb2f6cb.tar.gz |
Merge branch 'devel' into bigbreak
Conflicts: lib/pure/osproc.nim
Diffstat (limited to 'compiler/nim.ini')
0 files changed, 0 insertions, 0 deletions