Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
Jonathan Edwards 2015-03-11 16:26:10 -04:00
commit 50ed39fd66
129 changed files with 3195 additions and 2204 deletions

View file

@ -105,10 +105,10 @@ General FAQ
--------------------------
- Nim IDE: https://github.com/nim-lang/Aporia
- Emacs: https://github.com/Tass/nim-mode
- Emacs: https://github.com/reactormonk/nim-mode
- Vim: https://github.com/zah/nimrod.vim/
- Scite: Included
- Gedit: The `Aporia .lang file <https://github.com/nim-lang/Aporia/blob/master/share/gtksourceview-2.0/language-specs/nimrod.lang>`_
- Gedit: The `Aporia .lang file <https://github.com/nim-lang/Aporia/blob/master/share/gtksourceview-2.0/language-specs/nim.lang>`_
- jEdit: https://github.com/exhu/nimrod-misc/tree/master/jedit
- TextMate: Available in bundle installer (`Repository <https://github.com/textmate/nim.tmbundle>`_)
- Sublime Text: Available via Package Control (`Repository <https://github.com/Varriount/NimLime>`_)

View file

@ -59,6 +59,7 @@ srcdoc2: "pure/nimprof;pure/unittest;packages/docutils/highlite"
srcdoc2: "packages/docutils/rst;packages/docutils/rstast"
srcdoc2: "packages/docutils/rstgen;pure/logging;pure/asyncdispatch;pure/asyncnet"
srcdoc2: "pure/rawsockets;pure/asynchttpserver;pure/net;pure/selectors;pure/future"
srcdoc2: "pure/asyncfile"
srcdoc2: "pure/md5"
srcdoc2: "posix/posix"
srcdoc2: "pure/fenv"