← Back to branch summary

~mir-team/mir/chain-simplification

~mir-team/mir/chain-simplification

Viewing all changes in revision 3675.1.13.

Committer: Daniel van Vugt
Date: 2016-09-12 02:23:22 UTC
mfrom: (3696 development-branch)
mto: (3712.8.1 deprecated-api)
mto: This revision was merged to the branch mainline in revision 3758.
Revision ID: daniel.van.vugt@canonical.com-20160912022322-rmp3o4490sf0b07m

Merge latest trunk

files modified:
CMakeLists.txt

doc/footer.html.in

include/platform/mir/graphics/display.h

src/include/server/mir/display_changer.h

src/platforms/android/server/hwc_fallback_gl_renderer.h

src/server/display_server.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

tests/unit-tests/scene/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

include/platform/mir/graphics/display.h

src/include/server/mir/display_changer.h

src/platforms/android/server/hwc_fallback_gl_renderer.h

src/server/display_server.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

tests/unit-tests/scene/test_mediating_display_changer.cpp

Older »