← Back to branch summary

~dholbach/ubuntu-clock-app/reboot-packaging

~dholbach/ubuntu-clock-app/reboot-packaging

Viewing all changes in revision 74.

Committer: Daniel Holbach
Date: 2014-08-11 11:19:55 UTC
mfrom: (37.1.8 reboot)
Revision ID: daniel.holbach@canonical.com-20140811111955-bqt5b4xksbjvl0dv

merge from trunk

files modified:
app/alarm/AlarmList.qml

app/worldclock/UserWorldCityList.qml

backend/modules/Timezone/generictimezonemodel.cpp

backend/modules/Timezone/timezonemodel.cpp

backend/modules/Timezone/timezonemodel.h

backend/modules/Timezone/xmltimezonemodel.cpp

Show diffs side-by-side

added added

removed removed

app/alarm/AlarmList.qml

app/worldclock/UserWorldCityList.qml

backend/modules/Timezone/generictimezonemodel.cpp

backend/modules/Timezone/timezonemodel.cpp

backend/modules/Timezone/timezonemodel.h

backend/modules/Timezone/xmltimezonemodel.cpp

Older »