resolved conflict; added missing files

This commit is contained in:
Araq 2013-06-09 23:33:32 +02:00
commit 3f35e2d39e
14 changed files with 657 additions and 327 deletions

View file

@ -36,6 +36,8 @@ Language Additions
- Arrays can now be declared with a single integer literal ``N`` instead of a
range; the range is then ``0..N-1``.
- ``macros.dumpTree`` and ``macros.dumpLisp`` have been made ``immediate``,
``dumpTreeImm`` and ``dumpLispImm`` are now deprecated.
- Added ``requiresInit`` pragma to enforce explicit initialization.