summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-18 12:04:31 +0100
committermadmaxoft <github@xoft.cz>2013-12-18 12:04:31 +0100
commit4402725c61a2e409d5c42eff89d4d330361d8726 (patch)
tree795bc83894c8a8bb62e0fda477cdf2030775b33d /src
parentFixed player falling through the floor on spawn. (diff)
downloadcuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar.gz
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar.bz2
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar.lz
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar.xz
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.tar.zst
cuberite-4402725c61a2e409d5c42eff89d4d330361d8726.zip
Diffstat (limited to 'src')
-rw-r--r--src/Globals.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/Globals.h b/src/Globals.h
index fe6aee5c5..58badf4dd 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -124,9 +124,6 @@ typedef unsigned short UInt16;
#include <semaphore.h>
#include <errno.h>
#include <fcntl.h>
-#if !defined(ANDROID_NDK)
- #include <tr1/memory>
-#endif
#endif
#if defined(ANDROID_NDK)