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

diff --git a/dep/include/g3dlite/G3D/Intersect.h b/dep/include/g3dlite/G3D/Intersect.h
deleted file mode 100644
index 4a3c8fb4540..00000000000
--- a/dep/include/g3dlite/G3D/Intersect.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- @file Intersect.h
- 
- @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-  
- @created 2009-06-29
- @edited  2009-06-29
-
- Copyright 2000-2009, Morgan McGuire.
- All rights reserved.
-
- From the G3D Innovation Engine
- http://g3d.sf.net
- */
-#ifndef G3D_Intersect
-#define G3D_Intersect
-
-#include "G3D/platform.h"
-#include "G3D/Ray.h"
-#include "G3D/AABox.h"
-
-namespace G3D {
-
-/**
- @beta
- */
-class Intersect {
-public:
-
-	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
-
-      \cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
-      Computer Graphics Lab, TU Braunschweig, Germany and
-      University of Koblenz-Landau, Germany
-    */
-	static bool __fastcall rayAABox(const Ray& ray, const AABox& box);
-
-	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
-	 
-     \param time If there is an intersection, set to the time to that intersection. If the ray origin is inside the box,
-     this is a negative value indicating the distance backwards from the ray origin to the first intersection.
-     \a time is not set if there is no intersection.
-          
-     \cite Slope-Mul method from "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
-      Computer Graphics Lab, TU Braunschweig, Germany and
-      University of Koblenz-Landau, Germany
-      */
- 	static bool __fastcall rayAABox(const Ray& ray, const AABox& box, float& time);
-};
-
-}
-
-#endif