Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 0 insertions, 66 deletions

diff --git a/dep/include/g3dlite/G3D/debug.h b/dep/include/g3dlite/G3D/debug.h
deleted file mode 100644
index a7697fe9c01..00000000000
--- a/dep/include/g3dlite/G3D/debug.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- @file debug.h
-
- @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-
- @created 2001-08-26
- @edited  2006-02-16
-
-  Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
-*/
-
-#ifndef G3D_DEBUG_H
-#define G3D_DEBUG_H
-
-#include "G3D/platform.h"
-#ifdef _MSC_VER
-    #include <crtdbg.h>
-#endif
-
-#include "G3D/debugPrintf.h"
-#include "G3D/debugAssert.h"
-
-namespace G3D {
-
-#ifdef _MSC_VER
-    // Turn off 64-bit warnings
-#   pragma warning(push)
-#   pragma warning( disable : 4312)
-#   pragma warning( disable : 4267)
-#   pragma warning( disable : 4311)
-#endif
-
-
-/**
- Useful for debugging purposes.
- */
-inline bool isValidHeapPointer(const void* x) {
-    #ifdef _MSC_VER
-        return 
-            (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
-    #else
-        return x != NULL;
-    #endif
-}
-
-/**
- Returns true if the pointer is likely to be
- a valid pointer (instead of an arbitrary number). 
- Useful for debugging purposes.
- */
-inline bool isValidPointer(const void* x) {
-    #ifdef _MSC_VER
-        return x != ((void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
-    #else
-        return x != NULL;
-    #endif
-}
-
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif
-
-}
-
-#endif