diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:17:53 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:49:07 +0200 |
| commit | c2c141ed1e13e6f0fbc740d0ff37caba0b2a7c08 (patch) | |
| tree | a7892e105c85c7d4a32d3b3202e60ec2131e42c8 /daemon/notificationmanager.cpp | |
| parent | c9c1ed9faee07c0067827872ffe465d465c81470 (diff) | |
| parent | 9f8db04d6059e0b220e36a064d694a1b0649f5f0 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'daemon/notificationmanager.cpp')
0 files changed, 0 insertions, 0 deletions