Viewing all changes in revision 1075.
- Committer: Mirco Müller
- Date: 2014-08-08 13:37:29 UTC
- mfrom: (1067.2.68 unity8)
- Revision ID: mirco.mueller@ubuntu.com-20140808133729-mc8t03av49nzlfm7
Merged with trunk
- files added:
- .settings
- plugins/Unity/DashCommunicator
- qml/Stages/Animations
- src/Dash
- tests/mocks/Unity/DashCommunicator
- files removed:
- qml/Components/FilterGrid.qml
- qml/Dash/Apps/graphics
- files renamed:
- tests/autopilot/.project => .project
- tests/autopilot/.pydevproject => .pydevproject
- qml/Dash/CardFilterGrid.qml => qml/Dash/CardGrid.qml
- 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/Apps/graphics/close_btn@9.png
qml/Dash/graphics/phone/screenshots/unity8-dash@12.png
qml/Dash/graphics/phone/screenshots/vkb_portrait.png
qml/Launcher/graphics/notification@30.png
