Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 74 insertions, 0 deletions

diff --git a/ext/Log4Qt/.gitignore b/ext/Log4Qt/.gitignore
new file mode 100644
index 0000000..9c02ba4
--- /dev/null
+++ b/ext/Log4Qt/.gitignore
@@ -0,0 +1,74 @@
+doc/html/
+sql/
+winbuild/
+build/
+*.dll
+!doc/src
+bin/
+lib/
+
+# object files
+*.[oa]
+*.so
+*.so.*
+
+# qt creator projects
+*.cbp
+*.user
+
+# qt creator cmake directories
+qt-creator*/
+qtcreator*/
+
+# manually cmake build directories
+build*/
+
+# win32 libs
+*.dll
+# win32 impl
+*.lib
+
+# temporary dirs
+tmp/
+
+# logger dirs
+log/
+
+# html docs because it's generated by doxygen
+doc/html/
+
+# test
+test/
+test*/
+
+# qmake mocs
+moc_*.cpp
+
+# qt ui headers
+ui*.h
+
+# qt translations files
+*.qm
+
+# temporary files
+*~
+
+# emacs temporary files
+##*##
+
+# make files
+Makefile
+
+# cmake build system
+CMakeFiles/
+CMakeCache.txt
+
+# cmake mocs
+moc*.cxx
+*.moc
+
+# include cmake build file
+#!CMakeLists.txt
+
+#Doxygen file generated by cmake
+Doxyfile
\ No newline at end of file