summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/nversion.nim3
-rw-r--r--lib/system.nim9
-rw-r--r--lib/system/inclrtl.nim2
-rw-r--r--tools/website.tmpl2
-rw-r--r--web/index.txt10
5 files changed, 14 insertions, 12 deletions
diff --git a/compiler/nversion.nim b/compiler/nversion.nim
index b996d0b9b..3c868ed2a 100644
--- a/compiler/nversion.nim
+++ b/compiler/nversion.nim
@@ -12,10 +12,9 @@
 
 const 
   MaxSetElements* = 1 shl 16  # (2^16) to support unicode character sets?
-  defaultAsmMarkerSymbol* = '!'
   VersionMajor* = 0
   VersionMinor* = 9
-  VersionPatch* = 4
+  VersionPatch* = 5
   VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch
 
   RodFileVersion* = "1215"       # modify this if the rod-format changes!
diff --git a/lib/system.nim b/lib/system.nim
index 4a5d46a7f..ecee7dad7 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -234,6 +234,11 @@ template `>` * (x, y: expr): expr {.immediate.} =
   ## "is greater" operator. This is the same as ``y < x``.
   y < x
 
+const
+  appType* {.magic: "AppType"}: string = ""
+    ## a string that describes the application type. Possible values:
+    ## "console", "gui", "lib".
+
 include "system/inclrtl"
 
 const NoFakeVars* = defined(NimrodVM) ## true if the backend doesn't support \
@@ -940,10 +945,6 @@ const
     ## a string that describes the host CPU. Possible values:
     ## "i386", "alpha", "powerpc", "sparc", "amd64", "mips", "arm".
   
-  appType* {.magic: "AppType"}: string = ""
-    ## a string that describes the application type. Possible values:
-    ## "console", "gui", "lib".
-  
   seqShallowFlag = low(int)
   
 proc compileOption*(option: string): bool {.
diff --git a/lib/system/inclrtl.nim b/lib/system/inclrtl.nim
index 12eb90162..5c82db4da 100644
--- a/lib/system/inclrtl.nim
+++ b/lib/system/inclrtl.nim
@@ -1,7 +1,7 @@
 #
 #
 #            Nimrod's Runtime Library
-#        (c) Copyright 2013 Andreas Rumpf
+#        (c) Copyright 2014 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
diff --git a/tools/website.tmpl b/tools/website.tmpl
index bd68bdb06..1d6242736 100644
--- a/tools/website.tmpl
+++ b/tools/website.tmpl
@@ -71,7 +71,7 @@
     </div>
     <!-- site_foot -->
     <div id="site_foot">
-       <div id="legal">Copyright &copy; 2013 - Andreas Rumpf &amp; Contributors - All rights reserved - <a href="http://reign-studios.com/philipwitte/">Design by Philip Witte</a></div>
+       <div id="legal">Copyright &copy; 2014 - Andreas Rumpf &amp; Contributors - All rights reserved - <a href="http://reign-studios.com/philipwitte/">Design by Philip Witte</a></div>
     </div>
   </div>
   <script>
diff --git a/web/index.txt b/web/index.txt
index e504b65c4..c3459d56b 100644
--- a/web/index.txt
+++ b/web/index.txt
@@ -90,7 +90,9 @@ Nimrod plays nice with others
   interfacing.**
 * There are lots of bindings: for example, bindings to GTK2, the Windows API, 
   the POSIX API, OpenGL, SDL, Cairo, Python, Lua, TCL, X11, libzip, PCRE, 
-  libcurl, mySQL and SQLite are included in the standard distribution.
+  libcurl, mySQL and SQLite are included in the standard distribution or
+  can easily be obtained via the
+  `Babel package manager <https://github.com/nimrod-code/babel>`_.
 * A C to Nimrod conversion utility: New bindings to C libraries are easily 
   generated by ``c2nim``.
 
@@ -98,6 +100,6 @@ Nimrod plays nice with others
 Roadmap to 1.0
 ==============
 
-Version 0.9.x
-  * the symbol binding rules for templates will change
-  * a shared memory garbage collected heap will be provided
+Please have a look at
+this `wiki page <https://github.com/Araq/Nimrod/wiki/Feature-Matrix>`_ for
+an up-to-date overview.