← Back to branch summary

~mir-team/mir/remove-eol-whitespace

~mir-team/mir/remove-eol-whitespace

Viewing all changes in revision 3687.

Committer: Daniel van Vugt
Date: 2016-09-29 02:57:04 UTC
mfrom: (3640.1.86 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20160929025704-oexba6j7ixn3zjjv

Merge latest trunk and fix conflicts

files added:
src/server/graphics/nested/ipc_operations.cpp

src/server/graphics/nested/ipc_operations.h

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

files modified:
debian/control

include/common/mir_toolkit/mir_native_buffer.h

src/client/mir_buffer_api.cpp

src/client/symbols.map

src/include/client/mir/client_buffer.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/platform/mir/graphics/buffer_ipc_message.h

src/platforms/android/client/buffer.cpp

src/platforms/android/client/buffer.h

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/include/native_buffer.h

src/platforms/android/server/ipc_operations.cpp

src/platforms/eglstream-kms/client/client_buffer.cpp

src/platforms/eglstream-kms/client/client_buffer.h

src/platforms/mesa/client/client_buffer.cpp

src/platforms/mesa/client/client_buffer.h

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_buffer_packer.h

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/native_buffer.h

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tests/include/mir/test/doubles/mock_buffer_ipc_message.h

tests/include/mir/test/doubles/mock_client_buffer.h

tests/include/mir/test/doubles/null_client_buffer.h

tests/include/mir/test/doubles/stub_client_buffer.h

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/platforms/android/client/test_buffer.cpp

tests/unit-tests/platforms/android/client/test_gralloc_registrar.cpp

tests/unit-tests/platforms/android/server/test_platform.cpp

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

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

Show diffs side-by-side

added added

removed removed

include/common/mir_toolkit/mir_native_buffer.h

src/client/mir_buffer_api.cpp

src/client/symbols.map

src/include/client/mir/client_buffer.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/platform/mir/graphics/buffer_ipc_message.h

src/platforms/android/client/buffer.cpp

src/platforms/android/client/buffer.h

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/include/native_buffer.h

src/platforms/android/server/ipc_operations.cpp

src/platforms/eglstream-kms/client/client_buffer.cpp

src/platforms/eglstream-kms/client/client_buffer.h

src/platforms/mesa/client/client_buffer.cpp

src/platforms/mesa/client/client_buffer.h

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_buffer_packer.h

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/ipc_operations.cpp

src/server/graphics/nested/ipc_operations.h

src/server/graphics/nested/native_buffer.h

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tests/include/mir/test/doubles/mock_buffer_ipc_message.h

tests/include/mir/test/doubles/mock_client_buffer.h

tests/include/mir/test/doubles/null_client_buffer.h

tests/include/mir/test/doubles/stub_client_buffer.h

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/platforms/android/client/test_buffer.cpp

tests/unit-tests/platforms/android/client/test_gralloc_registrar.cpp

tests/unit-tests/platforms/android/server/test_platform.cpp

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

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

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

Older »