Merged IniFile into main MCS sources.

2014-10-23 15:15:10 +02:00
parent 154c329a25
commit 449d08cb3d
29 changed files with 29 additions and 40 deletions
@@ -19,11 +19,10 @@
 #include "OSSupport/Timer.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>