← Back to branch summary

~renatofilho/sync-monitor/fix-1339016-rtm

~renatofilho/sync-monitor/fix-1339016-rtm

Viewing all changes in revision 32.

Committer: Bill Filler
Date: 2014-11-06 22:25:07 UTC
mfrom: (31.2.9 sync-monitor)
Revision ID: bill.filler@canonical.com-20141106222507-so1zv1y51palyt8t

merge with trunk

files added:
accounts/applications/contacts-sync.application.in

debian/sync-monitor-uoa.install

po/POTFILES.in

src/sync-network.cpp

src/sync-network.h

upstart

upstart/CMakeLists.txt

upstart/sync-monitor.conf.in

files removed:
accounts/applications/calendar-sync.application.in

accounts/applications/contacts-sync.application.in

data

data/CMakeLists.txt

data/com.canonical.SyncMonitor.service.in

debian/sync-monitor-uoa.install

upstart

upstart/CMakeLists.txt

upstart/sync-monitor.conf.in

files modified:
CMakeLists.txt

Ubuntu/SyncMonitor/syncmonitor-qml.cpp

accounts/applications/CMakeLists.txt

accounts/services/google-caldav.service.in

debian/changelog

debian/control

debian/sync-monitor.install

src/CMakeLists.txt

src/eds-helper.cpp

src/eds-helper.h

src/notify-message.cpp

src/sync-account.cpp

src/sync-account.h

src/sync-daemon.cpp

src/sync-daemon.h

src/sync-dbus.cpp

src/sync-dbus.h

src/sync-queue.cpp

src/sync-queue.h

tests/unittest/eds-helper-mock.h

Show diffs side-by-side

added added

removed removed

Ubuntu/SyncMonitor/syncmonitor-qml.cpp

accounts/applications/CMakeLists.txt

accounts/applications/calendar-sync.application.in

accounts/applications/contacts-sync.application.in

accounts/applications/contacts-sync.application.in

accounts/services/google-caldav.service.in

data/CMakeLists.txt

data/com.canonical.SyncMonitor.service.in

debian/changelog

debian/sync-monitor-uoa.install

debian/sync-monitor-uoa.install

debian/sync-monitor.install

src/CMakeLists.txt

src/eds-helper.cpp

src/eds-helper.h

src/notify-message.cpp

src/sync-account.cpp

src/sync-account.h

src/sync-daemon.cpp

src/sync-daemon.h

src/sync-dbus.cpp

src/sync-dbus.h

src/sync-network.cpp

src/sync-network.h

src/sync-queue.cpp

src/sync-queue.h

tests/unittest/eds-helper-mock.h

upstart/CMakeLists.txt

upstart/CMakeLists.txt

upstart/sync-monitor.conf.in

upstart/sync-monitor.conf.in

Older »