← Back to branch summary

~macslow/+junk/notify-backend-frontend-proto

~macslow/+junk/notify-backend-frontend-proto

Viewing all changes in revision 125.

Committer: Mirco Müller
Date: 2013-05-15 10:38:19 UTC
mfrom: (109.1.13 notify-backend)
Revision ID: mirco.mueller@ubuntu.com-20130515103819-9oq8t7wjzbjqdfib

Merged with Jussi's branch and fixed all merge-conflicts

files removed:
include/notificationbackend.h

include/renderer.h

src/notificationbackend.cpp

src/renderer.cpp

files modified:
include/notification.h

include/notificationmodel.h

include/notificationserver.h

include/notify-backend.h

src/CMakeLists.txt

src/notificationmodel.cpp

src/notificationserver.cpp

test/CMakeLists.txt

test/notificationtest.cpp

tools/dbusclient.cpp

Show diffs side-by-side

added added

removed removed

include/notification.h

include/notificationbackend.h

include/notificationmodel.h

include/notificationserver.h

include/notify-backend.h

include/renderer.h

src/CMakeLists.txt

src/notificationbackend.cpp

src/notificationmodel.cpp

src/notificationserver.cpp

src/renderer.cpp

test/CMakeLists.txt

test/notificationtest.cpp

tools/dbusclient.cpp

Older »