Merge branch 'release-1.2'

aradi · Dec 5, 2016 · 4c4def1 · 4c4def1
2 parents 21fe1d8 + a90efed
commit 4c4def1
Show file tree

Hide file tree

Showing 8 changed files with 1,865 additions and 1,337 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,28 @@ Change Log
 ==========
 
 
+1.2
+===
+
+Added
+-----
+
+* Allow (and promote) usage of set directive instead of setvar.
+
+* Implement stop request via stop directive.
+
+* Assignment to variable tuples.
+
+* Hierarchial exception testing.
+
+
+Fixed
+-----
+
+* Wrong file name in error report, when exception occurs in a macro defined in
+  an included file.
+
+
 1.1
 ===
 

diff --git a/README.rst b/README.rst
@@ -27,7 +27,7 @@ Main features
       print *, "Some debug information"
     #:endif
 
-    #:setvar LOGLEVEL 2
+    #:set LOGLEVEL 2
 
 * Macro defintions and macro calls (apart of minor syntax differences similar to
   scoped intelligent Fortran macros, which probably will once become part of the