diff options
| author | Mattes D <github@xoft.cz> | 2014-10-24 10:19:13 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-24 10:19:13 +0200 |
| commit | 765bf006ad28d6dfcddd6c29ec203bbc7753e332 (patch) | |
| tree | 2ddd79061104d4a4f80442a432a52fd81120e631 /src/Root.cpp | |
| parent | Suggestions (diff) | |
| parent | Merge pull request #1565 from mc-server/MergedIniFile (diff) | |
| download | cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.gz cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.bz2 cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.lz cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.xz cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.zst cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.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 2a56a70be..c29310337 100644 --- 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> |