summary refs log tree commit diff stats
path: root/web/nimrod.ini
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-08-05 21:53:26 +0200
committerAraq <rumpf_a@web.de>2014-08-05 21:53:26 +0200
commitcf61072cc94649dc08c849ef2c8b076c28de5b35 (patch)
treef548903ca973f5336b353c008a0b0be8e62f4142 /web/nimrod.ini
parentca8135f34b30b5c9da62f6d55f6bc5726206535b (diff)
parent915d3291ab57d59e41877c98dba97d6388c56a35 (diff)
downloadNim-cf61072cc94649dc08c849ef2c8b076c28de5b35.tar.gz
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
Conflicts:
	compiler/ccgexprs.nim
Diffstat (limited to 'web/nimrod.ini')
0 files changed, 0 insertions, 0 deletions