*Merge.

--HG--
branch : trunk

1 files changed, 9 insertions, 9 deletions

diff --git a/dep/include/sockets/Exception.h b/dep/include/sockets/Exception.h
index 81ba7373d0d..8bfa9904d8b 100644
--- a/dep/include/sockets/Exception.h
+++ b/dep/include/sockets/Exception.h
@@ -1,7 +1,7 @@
 /**
- **	\file Exception.h
- **	\date  2007-09-28
- **	\author grymse@alhem.net
+ ** \file Exception.h
+ ** \date  2007-09-28
+ ** \author grymse@alhem.net
 **/
 /*
 Copyright (C) 2007  Anders Hedstrom
@@ -34,17 +34,17 @@ namespace SOCKETS_NAMESPACE {
 class Exception
 {
 public:
-	Exception(const std::string& description);
-	virtual ~Exception() {}
+    Exception(const std::string& description);
+    virtual ~Exception() {}
 
-	virtual const std::string ToString() const;
+    virtual const std::string ToString() const;
 
-	Exception(const Exception& ) {} // copy constructor
+    Exception(const Exception& ) {} // copy constructor
 
-	Exception& operator=(const Exception& ) { return *this; } // assignment operator
+    Exception& operator=(const Exception& ) { return *this; } // assignment operator
 
 private:
-	std::string m_description;
+    std::string m_description;
 
 };