*Merge.

--HG--
branch : trunk

1 files changed, 12 insertions, 12 deletions

diff --git a/dep/include/sockets/Mutex.h b/dep/include/sockets/Mutex.h
index 1de27760a1c..35b753ca028 100644
--- a/dep/include/sockets/Mutex.h
+++ b/dep/include/sockets/Mutex.h
@@ -1,6 +1,6 @@
 /** \file Mutex.h
- **	\date  2004-10-30
- **	\author grymse@alhem.net
+ ** \date  2004-10-30
+ ** \author grymse@alhem.net
 **/
 /*
 Copyright (C) 2004-2007  Anders Hedstrom
@@ -8,7 +8,7 @@ Copyright (C) 2004-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 
+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.
@@ -41,22 +41,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 namespace SOCKETS_NAMESPACE {
 #endif
 
-/** Mutex container class, used by Lock. 
-	\ingroup threading */
+/** Mutex container class, used by Lock.
+    \ingroup threading */
 class Mutex
 {
-	friend class Lock;
+    friend class Lock;
 public:
-	Mutex();
-	~Mutex();
+    Mutex();
+    ~Mutex();
 
-	void Lock();
-	void Unlock();
+    void Lock();
+    void Unlock();
 private:
 #ifdef _WIN32
-	HANDLE m_mutex;
+    HANDLE m_mutex;
 #else
-	pthread_mutex_t m_mutex;
+    pthread_mutex_t m_mutex;
 #endif
 };