diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-14 16:49:27 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-14 16:49:27 +0200 |
| commit | c358544734ae26770e91d56a92dcd8e22da71be5 (patch) | |
| tree | 8227bed64b6cbd7088102c762285e64a30418d56 /daemon/daemon.pro | |
| parent | 9160f139d399bce61c67a4ebc31dfdf1cc5d3e62 (diff) | |
| parent | c911932934f0a7d8bf1c252be4a3e718859b3b09 (diff) | |
Merge branch 'notifications' of github.com:smurfy/pebble into smurfy-notifications
Conflicts:
daemon/daemon.pro
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'daemon/daemon.pro')
| -rw-r--r-- | daemon/daemon.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro index 3db6918..cfcdae1 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -17,6 +17,7 @@ SOURCES += \ manager.cpp \ voicecallmanager.cpp \ voicecallhandler.cpp \ + notificationmanager.cpp \ watchconnector.cpp \ dbusconnector.cpp \ dbusadaptor.cpp \ @@ -26,6 +27,7 @@ HEADERS += \ manager.h \ voicecallmanager.h \ voicecallhandler.h \ + notificationmanager.h \ watchconnector.h \ dbusconnector.h \ dbusadaptor.h \ |