diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-20 22:25:45 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-20 23:21:05 +0200 |
| commit | c9c1ed9faee07c0067827872ffe465d465c81470 (patch) | |
| tree | 91b87b5ad63956bda1254cb4b083f3fc8d6551e4 /ext/Log4Qt/.gitignore | |
| parent | 9bbba72939248388dfc832a5bf20cb9539ab0675 (diff) | |
| parent | c47315faa12bbb36772c3f5897751bf74fa122f4 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
ext/Log4Qt
Diffstat (limited to 'ext/Log4Qt/.gitignore')
| -rw-r--r-- | ext/Log4Qt/.gitignore | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/ext/Log4Qt/.gitignore b/ext/Log4Qt/.gitignore deleted file mode 100644 index 9c02ba4..0000000 --- a/ext/Log4Qt/.gitignore +++ /dev/null @@ -1,74 +0,0 @@ -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 |