Merge branch master into CmakeMultiConfig.

2014-01-12 10:04:16 +01:00
parent 65417dd836 328b2db252
commit 180b9b9099
156 changed files with 2984 additions and 2759 deletions
@@ -19,6 +19,7 @@ cloc.xsl
 ## emacs
 *.*~
 *~
+*.orig

 # world inside source
 ChunkWorx.ini