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/Root.cpp
+++ b/src/Root.cpp
@@ -18,11 +18,10 @@
 #include "DeadlockDetect.h"
 #include "LoggerListeners.h"
 #include "BuildInfo.h"
-
-#include "inifile/iniFile.h"
+#include "IniFile.h"

 #ifdef _WIN32
-	#include "conio.h"
+	#include <conio.h>
 	#include <psapi.h>
 #elif defined(__linux__)
 	#include <fstream>