← Back to branch summary

~alan-griffiths/mir/cherry-pick-fix-1641166-for-0-25

~alan-griffiths/mir/cherry-pick-fix-1641166-for-0-25

Viewing all changes in revision 3808.

Committer: Brandon Schaefer
Date: 2016-11-07 16:46:53 UTC
mfrom: (1160.26.106 mir)
Revision ID: brandon.schaefer@canonical.com-20161107164653-8zn3y0if5np58e4g

* Merge ubuntu/mir --take-this

files added:
src/common/dispatch/legacy_readable_fd.cpp

files modified:
CMakeLists.txt

debian/changelog

src/common/dispatch/CMakeLists.txt

src/platform/symbols.map

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/unit-tests/platforms/nested/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

src/common/dispatch/CMakeLists.txt

src/common/dispatch/legacy_readable_fd.cpp

src/platform/symbols.map

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/unit-tests/platforms/nested/CMakeLists.txt

Older »