Conflicts: compiler/ccgutils.nim compiler/msgs.nim compiler/sem.nim compiler/semexprs.nim compiler/seminst.nim compiler/semmagic.nim compiler/semstmts.nim compiler/semtypes.nim compiler/semtypinst.nim compiler/sigmatch.nim compiler/types.nim compiler/vmgen.nim lib/core/macros.nim lib/system.nim tests/reject/tenummix.nim web/news.txt |
||
|---|---|---|
| .. | ||
| assets | ||
| snippets | ||
| community.txt | ||
| documentation.txt | ||
| download.txt | ||
| index.txt | ||
| links.txt | ||
| news.txt | ||
| nimrod.ini | ||
| question.txt | ||
| ticker.txt | ||