Viewing all changes in revision 164.
- Committer: Michael Terry
- Date: 2013-10-15 17:48:24 UTC
- mfrom: (138.2.326 trunk)
- Revision ID: michael.terry@canonical.com-20131015174824-x1n7rx100b0ph8v4
Merge from trunk
- files added:
- Components/LazyImage.qml
- Dash/Movie
- Dash/Previews
- data
- tests/qmltests/Components/tst_LazyImage
- tests/qmltests/Dash/Movie
- files removed:
- Dash/Apps/AppsAvailableForDownloadModel.qml
- plugins/Unity/IndicatorsLegacy
- plugins/Unity/IndicatorsLegacy/Network
- plugins/Unity/IndicatorsLegacy/Network/qml
- plugins/Unity/IndicatorsLegacy/qml
- plugins/Unity/IndicatorsLegacy/resources
- plugins/Unity/IndicatorsLegacy/resources/artwork
- src/Panel/Indicators/servicefiles
- tests/autopilot/unity8/indicators_client
- tests/autopilot/unity8/indicators_client/emulators
- tests/autopilot/unity8/indicators_client/tests
- tests/qmltests/Dash/Video
- files renamed:
- Greeter/PinPadButton.qml => Components/PinPadButton.qml
- Dash/Apps/AppReviews.qml => Dash/Previews/Reviews.qml
- Dash/Video/VideosFilterGrid.qml => Dash/Video/VideoFilterGrid.qml
- Panel/Indicators/DefaultIndicatorPage2.qml => Panel/Indicators/DefaultIndicatorPage.qml
- Panel/Indicators/DefaultIndicatorWidget2.qml => Panel/Indicators/DefaultIndicatorWidget.qml
- plugins/Unity/IndicatorsLegacy/Messaging/ => plugins/Unity/Indicators/Messaging/
- plugins/Unity/IndicatorsLegacy/Messaging/qml/MessageMenuItem.qml => plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml
- plugins/Unity/IndicatorsLegacy/resources/artwork/messaging/ => plugins/Unity/Indicators/resources/artwork/messaging/
- files modified:
- Bottombar/Bottombar.qml
expand all
collapse all
added
removed
Components/graphics/close@20.png
Dash/Video/graphics/movie_icon_holder@27.png
tests/qmltests/Components/tst_LazyImage/portrait.png
tests/qmltests/Components/tst_LazyImage/square.png
tests/qmltests/Components/tst_LazyImage/wide.png
