Merge branch 'devel' of https://github.com/nim-lang/Nim into devel

This commit is contained in:
Araq 2016-01-18 16:51:54 +01:00
commit e80d08583c
10 changed files with 55 additions and 10 deletions

View file

@ -185,6 +185,16 @@ via a commit, for a full list see
(`#3730 <https://github.com/nim-lang/Nim/issues/3730>`_)
2016-01-18 Andreas Rumpf's talk at OSCON Amsterdam
==================================================
In case you have missed it, here is Andreas' Nim: An Overview talk at
OSCON Amsterdam.
.. raw:: html
<iframe width="560" height="315" src="https://www.youtube.com/embed/4rJEBs_Nnaw" frameborder="0" allowfullscreen></iframe>
2015-10-27 Version 0.12.0 released
==================================

View file

@ -1,8 +1,13 @@
<a class="news" href="news.html#Z2016-01-18-version-0-13-0-released">
<h4>Jan 18, 2016</h4>
<h4>January 18, 2016</h4>
<p>Nim version 0.13.0 has been released!</p>
</a>
<a class="news" href="news.html#Z2016-01-18-andreas-rumpf-s-talk-at-oscon-amsterdam">
<h4>January 18, 2016</h4>
<p>Andreas Rumpf's talk at OSCON Amsterdam</p>
</a>
<a class="news" href="news.html#Z2015-10-27-version-0-12-0-released">
<h4>October 27, 2015</h4>
<p>Nim version 0.12.0 has been released!</p>

View file

@ -63,8 +63,8 @@ srcdoc2: "deprecated/pure/ftpclient"
srcdoc2: "pure/asyncfile;pure/asyncftpclient"
srcdoc2: "pure/md5;pure/rationals"
srcdoc2: "posix/posix"
srcdoc2: "pure/fenv"
srcdoc2: "pure/basic2d;pure/basic3d"
srcdoc2: "pure/fenv;pure/securehash"
srcdoc2: "pure/basic2d;pure/basic3d;pure/mersenne;pure/coro"
; Note: everything under 'webdoc' doesn't get listed in the index, so wrappers
; should live here