summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-24 09:13:39 +0200
committerMattes D <github@xoft.cz>2014-10-24 09:13:39 +0200
commit190d34e2f7faf4889f097853872afc51499077ad (patch)
treeac92559e9b37492c4b0225fd7aa9972a0db4702e /src/Root.cpp
parentOSSupport/CMakeLists.txt: fixed indentation (diff)
parentIniFile: Removed the problematic printf-like Set function. (diff)
downloadcuberite-190d34e2f7faf4889f097853872afc51499077ad.tar
cuberite-190d34e2f7faf4889f097853872afc51499077ad.tar.gz
cuberite-190d34e2f7faf4889f097853872afc51499077ad.tar.bz2
cuberite-190d34e2f7faf4889f097853872afc51499077ad.tar.lz
cuberite-190d34e2f7faf4889f097853872afc51499077ad.tar.xz
cuberite-190d34e2f7faf4889f097853872afc51499077ad.tar.zst
cuberite-190d34e2f7faf4889f097853872afc51499077ad.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 6a91ec238..24c1a4cc8 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -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>