← Back to branch summary

~mir-team/qtmir/devel-mir-next-update

~mir-team/qtmir/devel-mir-next-update

Viewing all changes in revision 272.

Committer: Daniel van Vugt
Date: 2015-03-06 09:20:42 UTC
mfrom: (266.1.57 qtmir)
Revision ID: daniel.van.vugt@canonical.com-20150306092042-825an7o1t28hylol

Merge latest trunk

files added:
debian/tests

debian/tests/control

debian/tests/run-tests

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/mirshell.h

files removed:
src/platforms/mirserver/focussetter.cpp

src/platforms/mirserver/focussetter.h

src/platforms/mirserver/mirplacementstrategy.cpp

src/platforms/mirserver/mirplacementstrategy.h

src/platforms/mirserver/surfaceconfigurator.cpp

src/platforms/mirserver/surfaceconfigurator.h

tests/modules/common/mock_focus_controller.h

files modified:
debian/changelog

debian/control

debian/rules

demos/qml-demo-shell/qml-demo-shell.qml

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/sessionmanager.cpp

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_renderable.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/tests/control

debian/tests/run-tests

demos/qml-demo-shell/qml-demo-shell.qml

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/sessionmanager.cpp

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/focussetter.cpp

src/platforms/mirserver/focussetter.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/mirplacementstrategy.cpp

src/platforms/mirserver/mirplacementstrategy.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/mirshell.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/surfaceconfigurator.cpp

src/platforms/mirserver/surfaceconfigurator.h

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/common/mock_focus_controller.h

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_renderable.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.h

Older »