Viewing all changes in revision 322.
- Committer: Nekhelesh Ramananthan
- Date: 2014-02-13 20:45:50 UTC
- mfrom: (314.1.26 trunk)
- Revision ID: krnekhelesh@gmail.com-20140213204550-9bgw2h3lfz0flsy8
merged trunk
- files added:
- CMakeLists.txt
- click
- files removed:
- apparmor
- files renamed:
- apparmor/clock.json => click/apparmor.json
- manifest.json => click/manifest.json.in
- ubuntu-clock-app.desktop => com.ubuntu.clock_clock.desktop.in
- ubuntu-clock-app.url-dispatcher => com.ubuntu.clock_clock.url-dispatcher
- ubuntu-clock-app => ubuntu-clock-app.in
- files modified:
- alarm/AddAlarmPage.qml
expand all
collapse all
added
removed
images/ListItemProgressionArrow@8.png
images/alarm_black.png
images/lap_icon@14.png
images/lap_icon@8.svg
images/search_item@8.svg
images/stopwatch_black.png
images/timer_black.png
images/timer_green.png
images/trash_icon@16.png
