Viewing all changes in revision 522.1.2.
- Committer: Michał Sawicz
- Date: 2013-11-27 11:47:14 UTC
- mfrom: (555 trunk)
- mto: (555.3.1 unity8-cleanup-app-stuff)
- mto: This revision was merged to the branch mainline in revision 561.
- Revision ID: michal.sawicz@canonical.com-20131127114714-8oabe3fqqm63wt3w
merge trunk
- files added:
- Notifications/ShapedIcon.qml
- files removed:
- Components/Time.js
- files renamed:
- plugins/Unity/bottombarvisibilitycommunicatorshell.cpp => plugins/Utils/bottombarvisibilitycommunicatorshell.cpp
- plugins/Unity/bottombarvisibilitycommunicatorshell.h => plugins/Utils/bottombarvisibilitycommunicatorshell.h
- plugins/Unity/categoryresults.cpp => tests/mocks/Unity/categoryresults.cpp
- plugins/Unity/categoryresults.h => tests/mocks/Unity/categoryresults.h
- plugins/Unity/iconutils.cpp => tests/mocks/Unity/iconutils.cpp
- plugins/Unity/iconutils.h => tests/mocks/Unity/iconutils.h
- tests/plugins/Ubuntu/Gestures/edgeDragExample.qml => tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml
- files modified:
- Bottombar/Bottombar.qml
expand all
collapse all
added
removed
