Viewing all changes in revision 1093.
- Committer: Michael Terry
- Date: 2014-08-07 15:30:54 UTC
- mfrom: (1086.1.48 unity8)
- Revision ID: michael.terry@canonical.com-20140807153054-nqahwmptl0dw9bum
Merge from trunk
- files added:
- data/unity8-dash.conf
- plugins/Unity/DashCommunicator
- src/Dash
- tests/mocks/Unity/DashCommunicator
- files removed:
- qml/Components/SeeMore.qml
- files renamed:
- qml/Dash/DashDepartments.qml => qml/Dash/DashNavigation.qml
- qml/Dash/DashDepartmentsList.qml => qml/Dash/DashNavigationList.qml
- tests/mocks/Unity/fake_department.cpp => tests/mocks/Unity/fake_navigation.cpp
- tests/mocks/Unity/fake_department.h => tests/mocks/Unity/fake_navigation.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Components/graphics/pagination_dot_off@30.png
qml/Components/graphics/pagination_dot_on@30.png
qml/Dash/graphics/phone/screenshots/unity8-dash@12.png
