diff options
| author | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
| commit | 2940ced832e506fb1bb2b5292d49b2c7c31afb5b (patch) | |
| tree | 9b5c06b80b752eda2cb5dd25d271d50d9eb1dc1f /src/Root.cpp | |
| parent | Reimplemented cEvent using C++11 primitives. (diff) | |
| parent | Merge pull request #1565 from mc-server/MergedIniFile (diff) | |
| download | cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.gz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.bz2 cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.lz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.xz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.zst cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.zip | |
Diffstat (limited to 'src/Root.cpp')
| -rw-r--r-- | src/Root.cpp | 5 |
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> |