← Back to branch summary

~ubuntu-clock-dev/ubuntu-clock-app/stopwatch-feature-staging

~ubuntu-clock-dev/ubuntu-clock-app/stopwatch-feature-staging

Viewing all changes in revision 366.

Committer: Nekhelesh Ramananthan
Date: 2015-08-17 12:27:20 UTC
mfrom: (315.2.22 ubuntu-clock-app)
Revision ID: krnekhelesh@gmail.com-20150817122720-dyi9wywxg4unqlav

merged lp:ubuntu-clock-app trunk

files modified:
app/alarm/AlarmModelComponent.qml

app/alarm/AlarmPage.qml

app/alarm/AlarmSettingsPage.qml

app/alarm/AlarmUtils.qml

app/alarm/EditAlarmPage.qml

app/components/AnalogMode.qml

app/components/AnalogShadow.qml

app/components/Background.qml

app/components/Clock.qml

app/components/ClockCircle.qml

app/components/DigitalMode.qml

app/components/DigitalShadow.qml

app/components/EmptyState.qml

app/components/Shadow.qml

app/components/SubtitledListItem.qml

app/upstreamcomponents/FakeHeader.qml

app/upstreamcomponents/FastScroll.js

app/upstreamcomponents/FastScroll.qml

app/worldclock/AddWorldCityButton.qml

app/worldclock/UserWorldCityDelegate.qml

app/worldclock/UserWorldCityList.qml

app/worldclock/WorldCityList.qml

backend/modules/Alarm/Settings/alarmsettings.cpp

backend/modules/Alarm/Settings/alarmsettings.h

backend/modules/Alarm/Settings/backend.cpp

backend/modules/Alarm/Settings/backend.h

backend/modules/DateTime/backend.cpp

backend/modules/DateTime/backend.h

backend/modules/DateTime/datetime.cpp

backend/modules/DateTime/datetime.h

backend/modules/GeoLocation/backend.cpp

backend/modules/GeoLocation/backend.h

backend/modules/GeoLocation/geolocation.cpp

backend/modules/GeoLocation/geolocation.h

backend/modules/Timezone/backend.cpp

backend/modules/Timezone/backend.h

backend/modules/Timezone/generictimezonemodel.cpp

backend/modules/Timezone/generictimezonemodel.h

backend/modules/Timezone/jsontimezonemodel.cpp

backend/modules/Timezone/jsontimezonemodel.h

backend/modules/Timezone/statictimezonemodel.cpp

backend/modules/Timezone/statictimezonemodel.h

backend/modules/Timezone/timezonemodel.cpp

backend/modules/Timezone/timezonemodel.h

debian/changelog

po/aa.po

po/am.po

po/ar.po

po/ast.po

po/az.po

po/br.po

po/ca.po

po/ca@valencia.po

po/com.ubuntu.clock.pot

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/fur.po

po/gd.po

po/gl.po

po/he.po

po/hu.po

po/id.po

po/it.po

po/km.po

po/kn.po

po/ko.po

po/lv.po

po/nb.po

po/nl.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sl.po

po/sr.po

po/sv.po

po/tk.po

po/tr.po

po/uk.po

po/vi.po

po/zh_CN.po

po/zh_TW.po

tests/autopilot/ubuntu_clock_app/CMakePluginParser.py

tests/autopilot/ubuntu_clock_app/fixture_setup.py

tests/autopilot/ubuntu_clock_app/tests/__init__.py

tests/autopilot/ubuntu_clock_app/tests/test_clock.py

tests/unit/ClockTestCase.qml

tests/unit/MockClockApp.qml

Show diffs side-by-side

added added

removed removed

app/alarm/AlarmModelComponent.qml

app/alarm/AlarmPage.qml

app/alarm/AlarmSettingsPage.qml

app/alarm/AlarmUtils.qml

app/alarm/EditAlarmPage.qml

app/components/AnalogMode.qml

app/components/AnalogShadow.qml

app/components/Background.qml

app/components/Clock.qml

app/components/ClockCircle.qml

app/components/DigitalMode.qml

app/components/DigitalShadow.qml

app/components/EmptyState.qml

app/components/Shadow.qml

app/components/SubtitledListItem.qml

app/upstreamcomponents/FakeHeader.qml

app/upstreamcomponents/FastScroll.js

app/upstreamcomponents/FastScroll.qml

app/worldclock/AddWorldCityButton.qml

app/worldclock/UserWorldCityDelegate.qml

app/worldclock/UserWorldCityList.qml

app/worldclock/WorldCityList.qml

backend/modules/Alarm/Settings/alarmsettings.cpp

backend/modules/Alarm/Settings/alarmsettings.h

backend/modules/Alarm/Settings/backend.cpp

backend/modules/Alarm/Settings/backend.h

backend/modules/DateTime/backend.cpp

backend/modules/DateTime/backend.h

backend/modules/DateTime/datetime.cpp

backend/modules/DateTime/datetime.h

backend/modules/GeoLocation/backend.cpp

backend/modules/GeoLocation/backend.h

backend/modules/GeoLocation/geolocation.cpp

backend/modules/GeoLocation/geolocation.h

backend/modules/Timezone/backend.cpp

backend/modules/Timezone/backend.h

backend/modules/Timezone/generictimezonemodel.cpp

backend/modules/Timezone/generictimezonemodel.h

backend/modules/Timezone/jsontimezonemodel.cpp

backend/modules/Timezone/jsontimezonemodel.h

backend/modules/Timezone/statictimezonemodel.cpp

backend/modules/Timezone/statictimezonemodel.h

backend/modules/Timezone/timezonemodel.cpp

backend/modules/Timezone/timezonemodel.h

debian/changelog

po/ca@valencia.po

po/com.ubuntu.clock.pot

tests/autopilot/ubuntu_clock_app/CMakePluginParser.py

tests/autopilot/ubuntu_clock_app/fixture_setup.py

tests/autopilot/ubuntu_clock_app/tests/__init__.py

tests/autopilot/ubuntu_clock_app/tests/test_clock.py

tests/unit/ClockTestCase.qml

tests/unit/MockClockApp.qml

Older »