Viewing all changes in revision 361.5.31.
- Committer: Michael Zanetti
- Date: 2013-10-04 17:38:27 UTC
- mfrom: (393 trunk)
- mto: This revision was merged to the branch mainline in revision 403.
- Revision ID: michael.zanetti@canonical.com-20131004173827-vy67mntxzbfns2ly
merge trunk
- files added:
- Components/TileStyle.qml
- files removed:
- Panel/Indicators/DatetimeIndicatorPage.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
- tests/autopilot/unity8/indicators_client
- tests/autopilot/unity8/indicators_client/emulators
- tests/autopilot/unity8/indicators_client/tests
- files renamed:
- Greeter/PinPadButton.qml => Components/PinPadButton.qml
- Panel/Indicators/DefaultIndicatorPage2.qml => Panel/Indicators/DefaultIndicatorPage.qml
- Panel/Indicators/DefaultIndicatorWidget2.qml => Panel/Indicators/DefaultIndicatorWidget.qml
- files modified:
- Bottombar/Bottombar.qml
expand all
collapse all
added
removed
