← Back to branch summary

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

Viewing all changes in revision 426.

Committer: Alan Griffiths
Date: 2016-03-14 09:54:45 UTC
mfrom: (417.1.45 qtmir)
Revision ID: alan@octopull.co.uk-20160314095445-bak1axpya5w1bsjs

merge lp:qtmir and resolve conflicts

files added:
src/platforms/mirserver/argvHelper.h

tests/mirserver/ArgvHelper

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

files removed:
debian/tests

debian/tests/control

debian/tests/run-tests

files modified:
debian/changelog

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenwindow.cpp

tests/framework/mock_proc_info.cpp

tests/framework/mock_session.cpp

tests/framework/mock_task_controller.cpp

tests/framework/qtmir_test.cpp

tests/mirserver/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/tests/control

debian/tests/run-tests

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/argvHelper.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenwindow.cpp

tests/framework/mock_proc_info.cpp

tests/framework/mock_session.cpp

tests/framework/mock_task_controller.cpp

tests/framework/qtmir_test.cpp

tests/mirserver/ArgvHelper/

tests/mirserver/ArgvHelper/CMakeLists.txt

tests/mirserver/ArgvHelper/argvHelper_test.cpp

tests/mirserver/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

Older »