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/Server.cpp
+++ b/src/Server.cpp
@@ -19,7 +19,7 @@
 #include "Protocol/ProtocolRecognizer.h"
 #include "CommandOutput.h"

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

 #include <fstream>