From a4a418a679f1ac760a8763edd856f0178cfc6dde Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 25 May 2012 07:18:52 +0000 Subject: Merged the composable_generator branch into the trunk git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Globals.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source/Globals.h') diff --git a/source/Globals.h b/source/Globals.h index 3a9c6e9db..df72b25a8 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -138,7 +138,7 @@ typedef short Int16; -// Common headers: +// Common headers (part 1, without macros): #include "StringUtils.h" #include "cSleep.h" #include "cCriticalSection.h" @@ -187,3 +187,11 @@ public: + +// Common headers (part 2, with macros): +#include "ChunkDef.h" +#include "BlockID.h" + + + + -- cgit v1.2.3