Viewing all changes in revision 2743.5.13.
- Committer: Josh Arenson
- Date: 2017-01-18 00:25:13 UTC
- mfrom: (2743.4.8 simple-lightdm-mock)
- mto: (2743.7.14 greeter-guest)
- mto: This revision was merged to the branch mainline in revision 2776.
- Revision ID: joshua.arenson@canonical.com-20170118002513-wf5yypnzo4brvg1p
Merge mterry's prereq
- files added:
- debian/shlibs.local
- plugins/Unity/ApplicationMenu
- qml/ApplicationMenus
- tests/graphics/screenshots
- tests/mocks/Unity/ApplicationMenu
- tests/mocks/Unity/Platform
- tests/plugins/ScreenGrabber
- tests/qmltests/ApplicationMenus
- files removed:
- plugins/Ubuntu/Payments
- tests/mocks/Ubuntu/Payments
- files renamed:
- debian/unity8-fake-env.install => debian/unity8-tests.install
- qml/Panel/IndicatorItem.qml => qml/Panel/Indicators/IndicatorItem.qml
- qml/Panel/Indicators/MenuItemFactory.qml => qml/Panel/Indicators/IndicatorMenuItemFactory.qml
- qml/Panel/IndicatorsBar.qml => qml/Panel/PanelBar.qml
- qml/Panel/IndicatorItemRow.qml => qml/Panel/PanelItemRow.qml
- qml/Panel/IndicatorsMenu.qml => qml/Panel/PanelMenu.qml
- qml/Panel/IndicatorPage.qml => qml/Panel/PanelMenuPage.qml
- tests/qmltests/Panel/tst_IndicatorItem.qml => tests/qmltests/Panel/Indicators/tst_IndicatorItem.qml
- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml => tests/qmltests/Panel/Indicators/tst_IndicatorMenuItemFactory.qml
- tests/qmltests/Panel/IndicatorTest.qml => tests/qmltests/Panel/PanelTest.qml
- tests/qmltests/Panel/tst_IndicatorsBar.qml => tests/qmltests/Panel/tst_PanelBar.qml
- tests/qmltests/Panel/tst_IndicatorItemRow.qml => tests/qmltests/Panel/tst_PanelItemRow.qml
- tests/qmltests/Panel/tst_IndicatorsMenu.qml => tests/qmltests/Panel/tst_PanelMenu.qml
- tests/qmltests/Panel/tst_IndicatorPage.qml => tests/qmltests/Panel/tst_PanelMenuPage.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
tests/graphics/screenshots/gallery@12.png
