← Back to branch summary

~dobey/indicator-datetime/fix-gsettings

~dobey/indicator-datetime/fix-gsettings

Viewing all changes in revision 482.

Committer: Rodney Dawes
Date: 2017-03-16 19:58:07 UTC
mfrom: (472.2.10 indicator-datetime)
Revision ID: rodney.dawes@canonical.com-20170316195807-b0i9q9vxb9atbj3x

Merge up trunk.

files added:
debian/indicator-datetime.maintscript

files removed:
data/indicator-datetime.desktop.in

data/indicator-datetime.upstart.desktop.in

files modified:
CMakeLists.txt

data/CMakeLists.txt

debian/changelog

debian/control

po/indicator-datetime.pot

src/CMakeLists.txt

src/actions-live.cpp

src/menu.cpp

src/notifications.cpp

tests/CMakeLists.txt

tests/test-live-actions.cpp

Show diffs side-by-side

added added

removed removed

data/CMakeLists.txt

data/indicator-datetime.desktop.in

data/indicator-datetime.upstart.desktop.in

debian/changelog

debian/indicator-datetime.maintscript

po/indicator-datetime.pot

src/CMakeLists.txt

src/actions-live.cpp

src/notifications.cpp

tests/CMakeLists.txt

tests/test-live-actions.cpp

Older »