Merge pull request #1565 from mc-server/MergedIniFile

Merged ini file
2014-10-24 09:13:39 +02:00
parent dd86c1f4a3 e272637ff5
commit 190d34e2f7
35 changed files with 36 additions and 71 deletions
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -20,7 +20,7 @@
 #include "../WorldStorage/StatSerializer.h"
 #include "../CompositeChat.h"

-#include "inifile/iniFile.h"
+#include "../IniFile.h"
 #include "json/json.h"

 // 6000 ticks or 5 minutes