*Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 6 deletions

diff --git a/dep/include/zthread/PriorityCondition.h b/dep/include/zthread/PriorityCondition.h
index 1fd86c41c11..a85a000e941 100644
--- a/dep/include/zthread/PriorityCondition.h
+++ b/dep/include/zthread/PriorityCondition.h
@@ -28,7 +28,7 @@
 #include "zthread/Waitable.h"
 
 namespace ZThread {
-  
+
   class PriorityConditionImpl;
 
   /**
@@ -49,9 +49,9 @@ namespace ZThread {
   class ZTHREAD_API PriorityCondition : public Waitable, private NonCopyable {
 
     PriorityConditionImpl* _impl;
-  
+
   public:
-  
+
     /**
      * @see Condition::Condition(Lockable& l)
      */
@@ -61,7 +61,7 @@ namespace ZThread {
      * @see Condition::~Condition()
      */
     ~PriorityCondition();
-  
+
     /**
      * @see Condition::signal()
      */
@@ -81,9 +81,9 @@ namespace ZThread {
      * @see Condition::wait(unsigned long timeout)
      */
     virtual bool wait(unsigned long timeout);
-  
+
   };
-  
+
 } // namespace ZThread
 
 #endif // __ZTPRIORITYCONDITION_H__