resolved conflicts with master

This commit is contained in:
Araq
2014-01-18 01:16:45 +01:00
22 changed files with 225 additions and 611 deletions

View File

@@ -9,6 +9,8 @@ Bug reports: http://github.com/Araq/Nimrod/issues.
For quickest feedback, join our IRC channel: irc://irc.freenode.net/nimrod
(logs at `<http://build.nimrod-code.org/irclogs/>`_).
Check out our Twitter account for latest news and announcements: `@nimrodlang <http://twitter.com/nimrodlang>`_.
How to help
===========