*Merge.

--HG--
branch : trunk

1 files changed, 15 insertions, 15 deletions

diff --git a/dep/include/sockets/ResolvServer.h b/dep/include/sockets/ResolvServer.h
index f8f8f5aadbf..05dcfd58adf 100644
--- a/dep/include/sockets/ResolvServer.h
+++ b/dep/include/sockets/ResolvServer.h
@@ -1,6 +1,6 @@
 /** \file ResolvServer.h
- **	\date  2005-03-24
- **	\author grymse@alhem.net
+ ** \date  2005-03-24
+ ** \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.
@@ -39,26 +39,26 @@ namespace SOCKETS_NAMESPACE {
 #endif
 
 /** \defgroup async Asynchronous DNS */
-/** Async DNS resolver thread. 
-	\ingroup async */
+/** Async DNS resolver thread.
+    \ingroup async */
 class ResolvServer : public Thread
 {
 public:
-	ResolvServer(port_t);
-	~ResolvServer();
+    ResolvServer(port_t);
+    ~ResolvServer();
 
-	void Run();
-	void Quit();
+    void Run();
+    void Quit();
 
-	bool Ready();
+    bool Ready();
 
 private:
-	ResolvServer(const ResolvServer& ) {} // copy constructor
-	ResolvServer& operator=(const ResolvServer& ) { return *this; } // assignment operator
+    ResolvServer(const ResolvServer& ) {} // copy constructor
+    ResolvServer& operator=(const ResolvServer& ) { return *this; } // assignment operator
 
-	bool m_quit;
-	port_t m_port;
-	bool m_ready;
+    bool m_quit;
+    port_t m_port;
+    bool m_ready;
 };