Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style

to native for some files that were still missing this property. This is 
a feeble attempt to reduce the amount of conflicts for future merges.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/log.cpp b/src/log.cpp
index 0d54a368..224736bd 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -35,6 +35,10 @@
 #include <iostream>
 #include <sstream>
 
+Logger::Logger():
+    mLogToStandardOut(false)
+{
+}
 
 Logger::~Logger()
 {
@@ -92,6 +96,11 @@ void Logger::log(const char *log_text, ...)
 
     mLogFile << timeStr.str() << buf << std::endl;
 
+    if (mLogToStandardOut)
+    {
+        std::cout << timeStr.str() << buf << std::endl;
+    }
+
     // Delete temporary buffer
     delete[] buf;
 }