Merge branch 'release-1.2.0'

Conflicts: xml_exporter.py
cbaakman · Aug 14, 2015 · 5a054df · 5a054df
2 parents 4660ce8 + 01cd3ff
commit 5a054df
Show file tree

Hide file tree

Showing 39 changed files with 1,789 additions and 732 deletions.
diff --git a/bin/test3d.zip b/bin/test3d.zip
diff --git a/configure b/configure
diff --git a/notes.txt b/notes.txt
@@ -1,4 +1,4 @@
-Game templates version 1.1.1
+Game templates version 1.2.0
 
 [test3d]