← Back to branch summary

~alan-griffiths/qtmir/mir-0.27-compat-artful

~alan-griffiths/qtmir/mir-0.27-compat-artful

Viewing all changes in revision 606.4.11.

Committer: Albert Astals Cid
Date: 2017-03-20 16:19:42 UTC
mfrom: (606.3.15 fix-prompt-session-crash-flattened)
mto: This revision was merged to the branch mainline in revision 622.
Revision ID: albert.astals@canonical.com-20170320161942-ke0izmptc46psqcq

Merge

files added:
src/modules/Unity/Application/sessionmap_interface.h

tests/framework/mock_sessionmap.h

files renamed:
src/platforms/mirserver/mirbuffer.cpp => src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/mirbuffer.h => src/platforms/mirserver/miral/mirbuffer.h

files modified:
src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miral/CMakeLists.txt

tests/framework/CMakeLists.txt

tests/modules/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/sessionmap_interface.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miral/CMakeLists.txt

src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/miral/mirbuffer.h

tests/framework/CMakeLists.txt

tests/framework/mock_sessionmap.h

tests/modules/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

Older »