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/deploy/include/SimpleTimeLayout | |
| 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/deploy/include/SimpleTimeLayout')
| -rw-r--r-- | ext/Log4Qt/deploy/include/SimpleTimeLayout | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/Log4Qt/deploy/include/SimpleTimeLayout b/ext/Log4Qt/deploy/include/SimpleTimeLayout deleted file mode 100644 index 706fd72..0000000 --- a/ext/Log4Qt/deploy/include/SimpleTimeLayout +++ /dev/null @@ -1 +0,0 @@ -#include "simpletimelayout.h" |