← Back to branch summary

~alan-griffiths/mir/test-ABI-bump-libmirserver

~alan-griffiths/mir/test-ABI-bump-libmirserver

Viewing all changes in revision 2319.2.13.

Committer: Alan Griffiths
Date: 2015-02-18 12:17:57 UTC
mfrom: (2326 development-branch)
mto: This revision was merged to the branch mainline in revision 2328.
Revision ID: alan@octopull.co.uk-20150218121757-1k3khmkh4fsjqxcq

merge lp:mir

files added:
benchmarks/benchmark_multiplexing_dispatchable.cpp

include/common/mir/dispatch/multiplexing_dispatchable.h

src/common/dispatch/multiplexing_dispatchable.cpp

src/common/dispatch/utils.cpp

src/common/dispatch/utils.h

tests/unit-tests/dispatch/test_dispatch_utils.cpp

tests/unit-tests/dispatch/test_multiplexing_dispatchable.cpp

files renamed:
debian/libmirplatform6.install => debian/libmirplatform7.install

files modified:
benchmarks/CMakeLists.txt

debian/control

include/platform/mir/graphics/buffer.h

src/CMakeLists.txt

src/common/dispatch/CMakeLists.txt

src/common/dispatch/simple_dispatch_thread.cpp

src/common/input/android/android_input_receiver_thread.cpp

src/common/symbols.map

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/android/server/symbols.map

src/platforms/common/server/symbols.map

src/platforms/mesa/server/display_buffer.cpp

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

src/platforms/mesa/server/shm_buffer.cpp

src/platforms/mesa/server/shm_buffer.h

src/platforms/mesa/server/symbols.map

src/server/compositor/gl_renderer.cpp

src/server/compositor/temporary_buffers.cpp

src/server/compositor/temporary_buffers.h

tests/include/mir_test_doubles/mock_buffer.h

tests/include/mir_test_doubles/stub_buffer.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/symbols-server.map

tests/unit-tests/CMakeLists.txt

tests/unit-tests/dispatch/CMakeLists.txt

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_shm_buffer.cpp

Show diffs side-by-side

added added

removed removed

benchmarks/CMakeLists.txt

benchmarks/benchmark_multiplexing_dispatchable.cpp

debian/libmirplatform7.install

include/common/mir/dispatch/multiplexing_dispatchable.h

include/platform/mir/graphics/buffer.h

src/CMakeLists.txt

src/common/dispatch/CMakeLists.txt

src/common/dispatch/multiplexing_dispatchable.cpp

src/common/dispatch/simple_dispatch_thread.cpp

src/common/dispatch/utils.cpp

src/common/dispatch/utils.h

src/common/input/android/android_input_receiver_thread.cpp

src/common/symbols.map

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/server/buffer.cpp

src/platforms/android/server/buffer.h

src/platforms/android/server/symbols.map

src/platforms/common/server/symbols.map

src/platforms/mesa/server/display_buffer.cpp

src/platforms/mesa/server/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h

src/platforms/mesa/server/shm_buffer.cpp

src/platforms/mesa/server/shm_buffer.h

src/platforms/mesa/server/symbols.map

src/server/compositor/gl_renderer.cpp

src/server/compositor/temporary_buffers.cpp

src/server/compositor/temporary_buffers.h

tests/include/mir_test_doubles/mock_buffer.h

tests/include/mir_test_doubles/stub_buffer.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/symbols-server.map

tests/unit-tests/CMakeLists.txt

tests/unit-tests/dispatch/CMakeLists.txt

tests/unit-tests/dispatch/test_dispatch_utils.cpp

tests/unit-tests/dispatch/test_multiplexing_dispatchable.cpp

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_shm_buffer.cpp

Older »