← Back to branch summary

~robertcarr/unity/phablet-integrate-mir-no-sw-cursor

~robertcarr/unity/phablet-integrate-mir-no-sw-cursor

Viewing all changes in revision 655.

Committer: Gerry Boland
Date: 2013-05-08 08:12:28 UTC
mfrom: (651.2.9 phablet)
Revision ID: gerry.boland@canonical.com-20130508081228-ruuh2h0uyl7uv9qp

Merge trunk

files removed:
Hud/AppStack.qml

Hud/AppStackItem.qml

Hud/graphics/app_selected@20.png

Hud/graphics/close@20.png

files modified:
Bottombar/Bottombar.qml

Hud/Hud.qml

Shell.qml

build_unity

debian/control

plugins/HudClient/hudclient.cpp

plugins/HudClient/hudclient.h

plugins/HudClient/hudtoolbarmodel.cpp

tests/qmltests/Dash/tst_DashPreview.qml

tests/qmltests/Dash/tst_PeoplePreview.qml

tests/qmltests/Hud/tst_Hud.qml

tests/qmltests/plugins/HudClient/CMakeLists.txt

tests/qmltests/plugins/HudClient/fake_hud_plugin.cpp

tests/qmltests/plugins/HudClient/fake_libhud_client.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.h

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

Show diffs side-by-side

added added

removed removed

Bottombar/Bottombar.qml

Hud/AppStack.qml

Hud/AppStackItem.qml

Hud/graphics/app_selected@20.png

Hud/graphics/close@20.png

plugins/HudClient/hudclient.cpp

plugins/HudClient/hudclient.h

plugins/HudClient/hudtoolbarmodel.cpp

tests/qmltests/Dash/tst_DashPreview.qml

tests/qmltests/Dash/tst_PeoplePreview.qml

tests/qmltests/Hud/tst_Hud.qml

tests/qmltests/plugins/HudClient/CMakeLists.txt

tests/qmltests/plugins/HudClient/fake_hud_plugin.cpp

tests/qmltests/plugins/HudClient/fake_libhud_client.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.h

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

Older »