Merged branch 'master' into c++11.

2014-10-24 10:19:13 +02:00
parent 51fa6b4090 190d34e2f7
commit 765bf006ad
47 changed files with 310 additions and 193 deletions
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"

 #include "ChunkGenerator.h"
-#include "inifile/iniFile.h"
+#include "../IniFile.h"
 #include "ChunkDesc.h"
 #include "ComposableGenerator.h"
 #include "Noise3DGenerator.h"