Viewing all changes in revision 777.
- Committer: Ying-Chun Liu
- Date: 2014-03-26 14:31:01 UTC
- mfrom: (774.1.10 unity8)
- Revision ID: paul.liu@canonical.com-20140326143101-pdx1bruhre1pl115
Merge trunk
- files added:
- qml/Components/graphics/headerback@27.png
- files removed:
- debian/scopes-recommends-generator
- qml/Dash/Generic
- qml/Dash/Movie
- qml/Dash/Music
- qml/Dash/Video
- qml/Dash/Video/graphics
- files renamed:
- qml/Dash/graphics/header_handlearrow2@20.png => qml/Dash/graphics/header_handlearrow2@27.png
- qml/Dash/graphics/header_handlearrow@20.png => qml/Dash/graphics/header_handlearrow@27.png
- tests/mocks/Unity/scopes-ng/fake_preview_model.cpp => tests/mocks/Unity/fake_previewmodel.cpp
- tests/mocks/Unity/scopes-ng/fake_preview_model.h => tests/mocks/Unity/fake_previewmodel.h
- files modified:
- data/unity8.conf
expand all
collapse all
added
removed
qml/Components/graphics/headerback@27.png
qml/Dash/Video/graphics/icon_button_amazon@20.png
qml/Dash/Video/graphics/icon_button_u1@20.png
qml/Dash/Video/graphics/movie_icon_holder@27.png
qml/Dash/graphics/dash_divider_top_darkgrad@27.png
qml/Dash/graphics/dash_divider_top_lightgrad@27.png
qml/Dash/graphics/header_handlearrow2@27.png
qml/Dash/graphics/header_handlearrow@27.png
qml/Dash/graphics/paper_landscape@27.png
qml/Dash/graphics/paper_portrait@27.png
qml/Dash/graphics/tabbarchevron@27.png
