*Merge.

--HG--
branch : trunk

1 files changed, 8 insertions, 8 deletions

diff --git a/dep/include/sockets/Lock.h b/dep/include/sockets/Lock.h
index 71fdd5e733d..7d67716a26a 100644
--- a/dep/include/sockets/Lock.h
+++ b/dep/include/sockets/Lock.h
@@ -1,6 +1,6 @@
 /** \file Lock.h
- **	\date  2005-08-22
- **	\author grymse@alhem.net
+ ** \date  2005-08-22
+ ** \author grymse@alhem.net
 **/
 /*
 Copyright (C) 2005,2007  Anders Hedstrom
@@ -8,7 +8,7 @@ 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 
+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.
@@ -37,16 +37,16 @@ namespace SOCKETS_NAMESPACE {
 
 class Mutex;
 
-/** Mutex encapsulation class. 
-	\ingroup threading */
+/** Mutex encapsulation class.
+    \ingroup threading */
 class Lock
 {
 public:
-	Lock(Mutex&);
-	~Lock();
+    Lock(Mutex&);
+    ~Lock();
 
 private:
-	Mutex& m_mutex;
+    Mutex& m_mutex;
 };