Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 15 insertions, 0 deletions

diff --git a/ext/Log4Qt/src/log4qt.cpp b/ext/Log4Qt/src/log4qt.cpp
new file mode 100755
index 0000000..430b022
--- /dev/null
+++ b/ext/Log4Qt/src/log4qt.cpp
@@ -0,0 +1,15 @@
+//============================================================================
+// Name        : log4qt.cpp
+// Author      : 
+// Version     :
+// Copyright   : Your copyright notice
+// Description : Hello World in C++, Ansi-style
+//============================================================================
+
+#include <iostream>
+using namespace std;
+
+int main() {
+	cout << "!!!Hello World!!!" << endl; // prints !!!Hello World!!!
+	return 0;
+}