Merge branch 'master' of github.com:Araq/Nimrod

2012-06-19 22:38:48 +02:00 · 2012-06-19 22:38:48 +02:00 · e0092cfae6
commit e0092cfae6
parent f191059e56 382a614a61
54 changed files with 1980 additions and 1251 deletions
--- a/tests/reject/tenummix.nim
+++ b/tests/reject/tenummix.nim
@ -1,6 +1,6 @@
 discard """
  file: "system.nim"
-  line: 640
+  line: 678
  errormsg: "type mismatch"
 """