← Back to branch summary

~charlesk/indicator-datetime/cpp

~charlesk/indicator-datetime/cpp

Viewing all changes in revision 244.1.14.

Committer: Ted Gould
Date: 2013-10-31 18:40:41 UTC
mfrom: (283 trunk.14.04)
mto: This revision was merged to the branch mainline in revision 285.
Revision ID: ted@gould.cx-20131031184041-23st9rymvnxpn8h3

Merge trunk

files added:
CMakeLists.txt

INSTALL

cmake

cmake/FindIntltool.cmake

cmake/GCov.cmake

cmake/GdbusCodegen.cmake

cmake/Translations.cmake

cmake/UseGSettings.cmake

data/CMakeLists.txt

panel

panel/CMakeLists.txt

po/CMakeLists.txt

src/CMakeLists.txt

tests/CMakeLists.txt

files removed:
Makefile.am

Makefile.am.coverage

autogen.sh

configure.ac

data/Makefile.am

src/Makefile.am

tests/Makefile.am

files renamed:
src/datetime-prefs-locations.c => panel/datetime-prefs-locations.c

src/datetime-prefs-locations.h => panel/datetime-prefs-locations.h

src/datetime-prefs.c => panel/datetime-prefs.c

files modified:
data/com.canonical.indicator.datetime.gschema.xml

data/datetime-dialog.ui

data/indicator-datetime.conf.in

data/indicator-datetime.desktop.in

debian/changelog

debian/control

debian/indicator-datetime.install

debian/rules

po/POTFILES.in

src/clock-live.c

src/main.c

src/planner-eds.c

src/service.c

src/settings-shared.h

src/timezone-file.c

src/timezone-geoclue.c

src/utils.c

src/utils.h

Show diffs side-by-side

added added

removed removed

Makefile.am.coverage

cmake/FindIntltool.cmake

cmake/GCov.cmake

cmake/GdbusCodegen.cmake

cmake/Translations.cmake

cmake/UseGSettings.cmake

data/CMakeLists.txt

data/Makefile.am

data/com.canonical.indicator.datetime.gschema.xml

data/datetime-dialog.ui

data/indicator-datetime.conf.in

data/indicator-datetime.desktop.in

debian/changelog

debian/indicator-datetime.install

panel/CMakeLists.txt

panel/datetime-prefs-locations.c

panel/datetime-prefs.c

po/CMakeLists.txt

src/CMakeLists.txt

src/Makefile.am

src/clock-live.c

src/planner-eds.c

src/settings-shared.h

src/timezone-file.c

src/timezone-geoclue.c

tests/CMakeLists.txt

tests/Makefile.am

Older »