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/include/g3dlite/G3D/Image1.h b/dep/include/g3dlite/G3D/Image1.h
deleted file mode 100644
index 711e83f2079..00000000000
--- a/dep/include/g3dlite/G3D/Image1.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
-  @file Image1.h
-
-  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-
-  @created 2007-01-31
-  @edited  2007-01-31
-*/
-
-
-#ifndef G3D_IMAGE1_H
-#define G3D_IMAGE1_H
-
-#include "G3D/platform.h"
-#include "G3D/Map2D.h"
-#include "G3D/Color1.h"
-#include "G3D/GImage.h"
-
-namespace G3D {
-
-typedef ReferenceCountedPointer<class Image1> Image1Ref;
-
-/**
- Luminance image with 32-bit floating point storage.
-
- See also G3D::Image1uint8, G3D::GImage.
- */
-class Image1 : public Map2D<Color1, Color1> {
-public:
-
-    typedef Image1      Type;
-    typedef ReferenceCountedPointer<class Image1>   Ref;
-    typedef Color1      Storage;
-    typedef Color1      Compute;
-
-protected:
-
-    Image1(int w, int h, WrapMode wrap);
-
-    void copyGImage(const class GImage& im);
-    void copyArray(const Color1* src, int w, int h);
-    void copyArray(const Color3* src, int w, int h);
-    void copyArray(const Color4* src, int w, int h);
-    void copyArray(const Color1uint8* src, int w, int h);
-    void copyArray(const Color3uint8* src, int w, int h);
-    void copyArray(const Color4uint8* src, int w, int h);
-
-public:
-
-    const class ImageFormat* format() const;
-
-    /** Creates an all-zero width x height image. */
-    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
-
-    /** Creates a 0 x 0 image. */
-    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
-
-    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
-    
-    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-
-    static Ref fromImage1uint8(const ReferenceCountedPointer<class Image1uint8>& im);
-
-    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
-
-    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
-        it is stripped. */
-    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
-
-    /** Saves in any of the formats supported by G3D::GImage. */
-    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
-};
-
-} // G3D
-
-#endif