← Back to branch summary

~albaguirre/mir/possibly-fix-yakkety-build-failure

~albaguirre/mir/possibly-fix-yakkety-build-failure

Viewing all changes in revision 3506.3.2.

Committer: Daniel van Vugt
Date: 2016-05-18 07:27:24 UTC
mfrom: (3511 development-branch)
mto: This revision was merged to the branch mainline in revision 3512.
Revision ID: daniel.van.vugt@canonical.com-20160518072724-f5b38ipijh7hkjzw

Merge latest trunk

files renamed:
debian/libmirplatform11.install => debian/libmirplatform12.install

files modified:
debian/control

src/CMakeLists.txt

src/client/mir_connection.cpp

src/platform/symbols.map

src/server/frontend/session_mediator.cpp

src/server/report/logging/display_report.cpp

src/server/scene/mediating_display_changer.cpp

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/integration-tests/session_management.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

debian/libmirplatform12.install

src/CMakeLists.txt

src/client/mir_connection.cpp

src/platform/symbols.map

src/server/frontend/session_mediator.cpp

src/server/report/logging/display_report.cpp

src/server/scene/mediating_display_changer.cpp

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/integration-tests/session_management.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Older »