← Back to branch summary

~nik90/ubuntu-clock-app/add-timer-placeholder-text

~nik90/ubuntu-clock-app/add-timer-placeholder-text

Viewing all changes in revision 318.

Committer: Nekhelesh Ramananthan
Date: 2014-02-01 17:36:04 UTC
mfrom: (314.1.5 trunk)
Revision ID: krnekhelesh@gmail.com-20140201173604-6azwgzrcxtiwy5bm

merge from master

Show diffs side-by-side

added added

removed removed

alarm/AddAlarmPage.qml

alarm/AlarmDays.qml

alarm/AlarmFace.qml

alarm/AlarmPage.qml

clock/ClockPage.qml

clock/EasterEgg.qml

clock/WorldClock.qml

common/ClockBase.qml

common/ClockUtils.js

common/KeyboardShortcuts.js

common/LabelDots.qml

common/SettingsPage.qml

stopwatch/Blip.qml

stopwatch/StopwatchFace.qml

stopwatch/StopwatchPage.qml

timer/PresetList.qml

timer/TimerFace.qml

timer/TimerPage.qml

ubuntu-clock-app.qml

Older »