← Back to branch summary

~alan-griffiths/qtmir/spike-using-WindowManager

~alan-griffiths/qtmir/spike-using-WindowManager

Viewing all changes in revision 278.

Committer: Daniel van Vugt
Date: 2015-04-02 08:31:43 UTC
mfrom: (277.1.4 qtmir1)
Revision ID: daniel.van.vugt@canonical.com-20150402083143-3hto3g1j7vj075x7

Merge lp:~mir-team/qtmir/devel-mir-next-update

files modified:
debian/control

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.cpp

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/surfaceobserver.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/common/mock_surface.h

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.cpp

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirshell.cpp

src/platforms/mirserver/surfaceobserver.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/modules/common/mock_surface.h

Older »