← Back to branch summary

~unity-team/qtmir/multimonitorNext

~unity-team/qtmir/multimonitorNext

Viewing all changes in revision 390.

Committer: Michał Sawicz
Date: 2015-10-15 07:05:16 UTC
mfrom: (384.1.4 origin/surviveEmptyTexture)
Revision ID: michal.sawicz@canonical.com-20151015070516-kscgz3m182cxeiib

Merge lp:~unity-team/qtmir/surviveEmptyTexture

files renamed:
tests/common/mock_display_buffer.h => tests/common/mock_gl_display_buffer.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

tests/common/fake_displayconfigurationoutput.h

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/ScreenController/screencontroller_test.cpp

tests/mirserver/ScreenController/stub_display.h

tests/modules/common/mock_mir_session.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

tests/common/fake_displayconfigurationoutput.h

tests/common/mock_gl_display_buffer.h

tests/mirserver/ScreenController/CMakeLists.txt

tests/mirserver/ScreenController/screencontroller_test.cpp

tests/mirserver/ScreenController/stub_display.h

tests/modules/common/mock_mir_session.h

Older »