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, 81 deletions

diff --git a/dep/src/g3dlite/BinaryFormat.cpp b/dep/src/g3dlite/BinaryFormat.cpp
deleted file mode 100644
index d3991378f45..00000000000
--- a/dep/src/g3dlite/BinaryFormat.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- @file BinaryFormat.cpp
-  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-
-  @created 2005-06-10
-  @edited  2005-06-10
- */
-
-#include "G3D/BinaryFormat.h"
-
-namespace G3D {
-
-int32 byteSize(BinaryFormat f) {
-    switch (f) {
-    case BOOL8_BINFMT:
-    case UINT8_BINFMT:
-    case INT8_BINFMT:
-        return 1;
-
-    case UINT16_BINFMT:
-    case INT16_BINFMT:
-        return 2;
-
-    case FLOAT16_BINFMT:
-        return 2;
-
-    case UINT32_BINFMT:
-    case INT32_BINFMT:
-    case FLOAT32_BINFMT:
-        return 4;
-
-    case FLOAT64_BINFMT:
-    case UINT64_BINFMT:
-    case INT64_BINFMT:
-        return 8;
-
-    case INT128_BINFMT:
-    case UINT128_BINFMT:
-        return 16;
-
-    case VECTOR2_BINFMT:
-        return 2 * 4;
-
-    case VECTOR2INT16_BINFMT:
-        return 2 * 2;
-
-    case VECTOR3_BINFMT:
-        return 3 * 4;
-
-    case VECTOR3INT16_BINFMT:
-        return 3 * 2;
-
-    case VECTOR4_BINFMT:
-        return 4 * 4;
-
-    case VECTOR4INT16_BINFMT:
-        return 4 * 4;
-
-    case COLOR3_BINFMT:
-        return 3 * 4;
-
-    case COLOR3UINT8_BINFMT:
-        return 3 * 1;
-
-    case COLOR3INT16_BINFMT:
-        return 3 * 2;
-
-    case COLOR4_BINFMT:
-        return 4 * 4;
-
-    case COLOR4UINT8_BINFMT:
-        return 4 * 1;
-
-    case COLOR4INT16_BINFMT:
-        return 4 * 2;
-
-    default:
-        return -1;
-    }
-}
-}