diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-11-23 18:13:40 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-11-23 18:13:40 +0100 |
| commit | 2ae4d2a96abf705c48d3e9440f301d1f88a9722a (patch) | |
| tree | 6c773c4e30da81af852c3a6cca01e0d275da9908 | |
| parent | Merge remote-tracking branch 'origin/master' into c++11 (diff) | |
| download | cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar.gz cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar.bz2 cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar.lz cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar.xz cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.tar.zst cuberite-2ae4d2a96abf705c48d3e9440f301d1f88a9722a.zip | |
| -rw-r--r-- | src/Generating/Noise3DGenerator.cpp | 1 | ||||
| -rw-r--r-- | src/Noise/Noise.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp index 78b739d32..c8f87ec8e 100644 --- a/src/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "Noise3DGenerator.h" #include "../OSSupport/File.h" -#include "../OSSupport/Timer.h" #include "../IniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/src/Noise/Noise.cpp b/src/Noise/Noise.cpp index 509be7d6c..0249ab6c1 100644 --- a/src/Noise/Noise.cpp +++ b/src/Noise/Noise.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Noise.h" -#include "OSSupport/Timer.h" #define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x)) |