Viewing all changes in revision 993.
- Committer: Michał Sawicz
- Date: 2014-07-10 10:58:15 UTC
- mfrom: (984.1.52 unity8)
- Revision ID: michal.sawicz@canonical.com-20140710105815-bum6bjq3pur8s820
Merge trunk
- files added:
- plugins/Dash/ScopeStyle.qml
- qml/Components/SearchHistoryModel
- tests/mocks/Ubuntu/Telephony
- tests/qmltests/Components/tst_PageHeader
- files removed:
- qml/Components/PageHeaderLabel.qml
- files renamed:
- qml/Dash/graphics/phone/screenshots/phone@12.png => qml/Dash/graphics/phone/screenshots/dialer@12.png
- qml/graphics/applicationIcons/phone-app@18.png => qml/graphics/applicationIcons/dialer-app@18.png
- tests/qmltests/Components/tst_PageHeaderLabel.qml => tests/qmltests/Components/tst_PageHeader.qml
- files modified:
- build.sh
expand all
collapse all
added
removed
qml/Components/graphics/headerback@27.png
qml/Dash/graphics/icon_listview_clear@20.png
qml/Dash/graphics/tick@30.png
qml/Launcher/graphics/divider-line.png
qml/Launcher/graphics/highlight@18.png
qml/Launcher/graphics/home@18.png
qml/Launcher/graphics/icon-top-highlight.png
qml/Launcher/graphics/launcher_bg@30.png
qml/Launcher/graphics/non-selected@18.png
qml/Launcher/graphics/selected@18.png
qml/Launcher/graphics/triangle@18.png
tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg
