← Back to branch summary

~mterry/unity8/sim-unlock-on-boot

~mterry/unity8/sim-unlock-on-boot

Viewing all changes in revision 1167.

Committer: Michael Terry
Date: 2014-08-21 19:57:25 UTC
mfrom: (1139.2.19 lifecycle)
Revision ID: michael.terry@canonical.com-20140821195725-oi8e5l67ywiw5txe

Merge lifecycle branch in

files added:
qml/Stages/ApplicationWindow.qml

tests/mocks/Unity/Application/MirSurfaceItem.qml

tests/mocks/Unity/Application/VirtualKeyboard.qml

tests/qmltests/Stages/tst_ApplicationWindow.qml

tests/qmltests/Stages/tst_SpreadDelegate.qml

files removed:
qml/Stages/AppSurfaceContainer.qml

tests/mocks/Unity/Application/ApplicationImage.cpp

tests/mocks/Unity/Application/ApplicationImage.h

tests/mocks/Unity/Application/InputFilterArea.qml

tests/mocks/Unity/Application/OSKController.qml

tests/mocks/Unity/Application/VirtualKeyboard.cpp

tests/mocks/Unity/Application/VirtualKeyboard.h

files modified:
debian/control

include/paths.h.in

plugins/Unity/Launcher/CMakeLists.txt

qml/Dash/graphics/phone/screenshots/vkb_portrait.png

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/SurfaceContainer.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

tests/mocks/Unity/Application/Application.qmltypes

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationInfo.h

tests/mocks/Unity/Application/ApplicationManager.cpp

tests/mocks/Unity/Application/ApplicationManager.h

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/Application/CMakeLists.txt

tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

tests/mocks/Unity/Application/SurfaceManager.cpp

tests/mocks/Unity/Application/SurfaceManager.h

tests/mocks/Unity/Application/plugin.cpp

tests/mocks/Unity/Application/qmldir

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Show diffs side-by-side

added added

removed removed

include/paths.h.in

plugins/Unity/Launcher/CMakeLists.txt

qml/Dash/graphics/phone/screenshots/vkb_portrait.png

qml/Stages/AppSurfaceContainer.qml

qml/Stages/ApplicationWindow.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/SurfaceContainer.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

tests/mocks/Unity/Application/Application.qmltypes

tests/mocks/Unity/Application/ApplicationImage.cpp

tests/mocks/Unity/Application/ApplicationImage.h

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationInfo.h

tests/mocks/Unity/Application/ApplicationManager.cpp

tests/mocks/Unity/Application/ApplicationManager.h

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/Application/CMakeLists.txt

tests/mocks/Unity/Application/InputFilterArea.qml

tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

tests/mocks/Unity/Application/MirSurfaceItem.qml

tests/mocks/Unity/Application/OSKController.qml

tests/mocks/Unity/Application/SurfaceManager.cpp

tests/mocks/Unity/Application/SurfaceManager.h

tests/mocks/Unity/Application/VirtualKeyboard.cpp

tests/mocks/Unity/Application/VirtualKeyboard.h

tests/mocks/Unity/Application/VirtualKeyboard.qml

tests/mocks/Unity/Application/plugin.cpp

tests/mocks/Unity/Application/qmldir

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Stages/tst_ApplicationWindow.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/Stages/tst_SpreadDelegate.qml

tests/qmltests/tst_Shell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Older »