Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -118,7 +118,7 @@ enum LogChannel
    LogStatus,              // Used for status changed messages
    LogTime,                // Used for time stamp messages
    LogDebug,
-    LogMisc    
+    LogMisc
 };

 } // namespace Debugger