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

diff --git a/dep/src/sockets/Lock.cpp b/dep/src/sockets/Lock.cpp
deleted file mode 100644
index b75664cfbdc..00000000000
--- a/dep/src/sockets/Lock.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/** \file Lock.cpp
- ** \date  2005-08-22
- ** \author grymse@alhem.net
-**/
-/*
-Copyright (C) 2005,2007  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-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.
-*/
-#include "Mutex.h"
-#include "Lock.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-Lock::Lock(Mutex& m) : m_mutex(m)
-{
-    m_mutex.Lock();
-}
-
-Lock::~Lock()
-{
-    m_mutex.Unlock();
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-