Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop

2013-10-06 01:13:20 +01:00
parent 2398acc9e4 f83119ce7e
commit 7aeea14a02
69 changed files with 1375 additions and 827 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -168,6 +168,14 @@ MultiMC.h
 MultiMC.cpp
 MultiMCVersion.h

+# Logging
+logger/QsDebugOutput.cpp
+logger/QsDebugOutput.h
+logger/QsLog.cpp
+logger/QsLog.h
+logger/QsLogDest.cpp
+logger/QsLogDest.h
+
 # GUI
 gui/mainwindow.h
 gui/mainwindow.cpp