Viewing all changes in revision 66.
- Committer: Daniel Holbach
- Date: 2014-08-08 09:41:19 UTC
- mfrom: (37.1.6 reboot)
- Revision ID: daniel.holbach@canonical.com-20140808094119-ajlzuwjfcyxmtnj5
merge from trunk
- files added:
- app/alarm/AlarmDelegate.qml
- app/upstreamcomponents
- files renamed:
- app/components/PageWithBottomEdge.qml => app/upstreamcomponents/PageWithBottomEdge.qml
- files modified:
- app/CMakeLists.txt
expand all
collapse all
added
removed
