← Back to branch summary

~kdub/mir/fix-1597717

~kdub/mir/fix-1597717

Viewing all changes in revision 3568.

Committer: Kevin DuBois
Date: 2016-07-01 14:09:24 UTC
mfrom: (3566.1.2 development-branch)
Revision ID: kevin.dubois@canonical.com-20160701140924-ojfxaek1xvm1pqhx

merge in mir

files modified:
src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_generic.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/android/test_server_interpreter.cpp

Show diffs side-by-side

added added

removed removed

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display.cpp

tests/mir_test_doubles/mock_gl.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_generic.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/android/test_server_interpreter.cpp

Older »