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

diff --git a/dep/include/libmpq/extract.h b/dep/include/libmpq/extract.h
deleted file mode 100644
index d6ea794f162..00000000000
--- a/dep/include/libmpq/extract.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  extract.h -- header for the extraction functions used by mpq-tools.
- *
- *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */       
-
-#ifndef _EXTRACT_H
-#define _EXTRACT_H
-
-/* define compression types for multilpe compressions. */
-#define LIBMPQ_COMPRESSION_HUFFMAN		0x01		/* huffman compression. (used on wave files only and introduced in starcraft) */
-#define LIBMPQ_COMPRESSION_ZLIB			0x02		/* zlib compression. (introduced in warcraft 3) */
-#define LIBMPQ_COMPRESSION_PKZIP		0x08		/* pkware dcl compression. (first used compression algorithm) */
-#define LIBMPQ_COMPRESSION_BZIP2		0x10		/* bzip compression. (introduced in warcraft 3 - the frozen throne) */
-#define LIBMPQ_COMPRESSION_WAVE_MONO		0x40		/* adpcm 4:1 compression. (introduced in starcraft) */
-#define LIBMPQ_COMPRESSION_WAVE_STEREO		0x80		/* adpcm 4:1 compression. (introduced in starcraft) */
-
-/*
- *  table for decompression functions, return value for all functions
- *  is the transferred data size or one of the following error constants:
- *
- *  LIBMPQ_ERROR_MALLOC
- *  LIBMPQ_ERROR_DECOMPRESS
- */
-typedef int32_t		(*DECOMPRESS)(uint8_t *, uint32_t, uint8_t *, uint32_t);
-typedef struct {
-	uint32_t	mask;			/* decompression bit. */
-	DECOMPRESS	decompress;		/* decompression function. */
-} decompress_table_s;
-
-/*
- *  huffman decompression routine, the in_size parameter is not used,
- *  but needs to be specified due to compatibility reasons.
- *
- *  1500F5F0
- */
-extern int32_t libmpq__decompress_huffman(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using zlib. */
-extern int32_t libmpq__decompress_zlib(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using pkzip. */
-extern int32_t libmpq__decompress_pkzip(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using bzip2. */
-extern int32_t libmpq__decompress_bzip2(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using wave. (1 channel) */
-extern int32_t libmpq__decompress_wave_mono(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using wave. (2 channels) */
-extern int32_t libmpq__decompress_wave_stereo(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-/* decompression using multiple of the above algorithm. */
-extern int32_t libmpq__decompress_multi(
-	uint8_t		*in_buf,
-	uint32_t	in_size,
-	uint8_t		*out_buf,
-	uint32_t	out_size
-);
-
-#endif						/* _EXTRACT_H */