diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /ext/Log4Qt/deploy/include/SimpleTimeLayout | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'ext/Log4Qt/deploy/include/SimpleTimeLayout')
| -rw-r--r-- | ext/Log4Qt/deploy/include/SimpleTimeLayout | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/Log4Qt/deploy/include/SimpleTimeLayout b/ext/Log4Qt/deploy/include/SimpleTimeLayout new file mode 100644 index 0000000..706fd72 --- /dev/null +++ b/ext/Log4Qt/deploy/include/SimpleTimeLayout @@ -0,0 +1 @@ +#include "simpletimelayout.h" |