← Back to branch summary

~kdub/mir/nested-passthrough

~kdub/mir/nested-passthrough

Viewing all changes in revision 3735.

Committer: Kevin DuBois
Date: 2016-09-30 13:17:32 UTC
mfrom: (3676.1.30 nested-db-optimize)
Revision ID: kevin.dubois@canonical.com-20160930131732-rl9wt13uvoc0q8lu

merge in base branch, fix 3 conflicts

files modified:
src/server/graphics/nested/native_buffer.h

tests/unit-tests/platforms/nested/test_buffer.cpp

tests/unit-tests/platforms/nested/test_ipc_operations.cpp

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/native_buffer.h

tests/unit-tests/platforms/nested/test_buffer.cpp

tests/unit-tests/platforms/nested/test_ipc_operations.cpp

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

Older »