← Back to branch summary

~raof/mir/prober-drm-device-probe

~raof/mir/prober-drm-device-probe

Viewing all changes in revision 781.

Committer: Christopher James Halse Rogers
Date: 2013-07-01 07:32:26 UTC
mfrom: (761.1.32 trunk)
Revision ID: raof@ubuntu.com-20130701073226-vqc2vq8jhe98v1vh

Merge trunk, resolving conflicts

files added:
debian/mir-test-tools.lintian-overrides

include/server/mir/frontend/communicator_report.h

include/server/mir/graphics/gl_pixel_buffer.h

include/server/mir/shared_library.h

include/server/mir/shell/pixel_buffer.h

include/server/mir/shell/snapshot.h

include/server/mir/shell/snapshot_strategy.h

include/server/mir/shell/surface_buffer_access.h

include/server/mir/shell/threaded_snapshot_strategy.h

include/shared/mir/graphics/android/mir_native_buffer.h

include/test/mir_test_doubles/null_snapshot_strategy.h

src/server/graphics/gl_pixel_buffer.cpp

src/server/shared_library.cpp

src/server/shell/threaded_snapshot_strategy.cpp

src/shared/graphics/android/mir_native_buffer.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/graphics/android/test_external_refcount.cpp

tests/unit-tests/graphics/test_gl_pixel_buffer.cpp

tests/unit-tests/shared_library_test.cpp

tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/copyright

debian/libmirclient-dev.install

debian/libmirclient1.install

debian/libmirprotobuf-dev.install

debian/libmirprotobuf0.install

debian/libmirserver-dev.install

debian/libmirserver0.install

debian/mir-demos.install

debian/mir-test-tools.install

debian/mircommon-dev.install

debian/rules

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo_client_accelerated.cpp

examples/eglapp.c

examples/render_to_fb.cpp

guides/CMakeLists.txt

include/client/mir_toolkit/mir_client_library.h

include/server/mir/compositor/buffer_allocation_strategy.h

include/server/mir/compositor/buffer_stream_surfaces.h

include/server/mir/compositor/swapper_factory.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/surface.h

include/server/mir/graphics/display.h

include/server/mir/graphics/display_configuration.h

include/server/mir/graphics/gl_renderer.h

include/server/mir/graphics/platform.h

include/server/mir/graphics/renderable.h

include/server/mir/graphics/renderer.h

include/server/mir/shell/application_session.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/surfaces/buffer_stream.h

include/server/mir/surfaces/surface.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test/test_protobuf_server.h

include/test/mir_test_doubles/mock_android_registrar.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_client_surface.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/mock_swapper_factory.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_surface.h

src/client/CMakeLists.txt

src/client/android/android_client_buffer.cpp

src/client/android/android_client_buffer.h

src/client/android/android_client_buffer_factory.cpp

src/client/android/android_registrar.cpp

src/client/android/android_registrar.h

src/client/android/android_registrar_gralloc.h

src/client/lttng/CMakeLists.txt

src/client/mir_client_library.cpp

src/client/mir_client_surface.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/rendering_operator.cpp

src/server/compositor/swapper_factory.cpp

src/server/compositor/switching_bundle.cpp

src/server/default_server_configuration.cpp

src/server/frontend/make_protobuf_socket_communicator.cpp

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/protobuf_socket_communicator.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/graphics/CMakeLists.txt

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_alloc_adaptor.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/internal_client_window.cpp

src/server/graphics/gbm/CMakeLists.txt

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_display.h

src/server/graphics/gbm/gbm_platform.cpp

src/server/graphics/gbm/internal_native_surface.cpp

src/server/graphics/gbm/kms_display_configuration.cpp

src/server/graphics/gbm/kms_display_configuration.h

src/server/graphics/gbm/linux_virtual_terminal.cpp

src/server/graphics/gbm/linux_virtual_terminal.h

src/server/graphics/gl_renderer.cpp

src/server/logging/glog_logger.cpp

src/server/lttng/CMakeLists.txt

src/server/shell/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/surfaces/surface.cpp

src/shared/CMakeLists.txt

src/shared/graphics/android/CMakeLists.txt

src/shared/lttng/CMakeLists.txt

src/shared/lttng/tracepoint_provider.cpp

src/shared/protobuf/CMakeLists.txt

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/shell/CMakeLists.txt

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir-stress/CMakeLists.txt

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/android/test_client_android_buffer.cpp

tests/unit-tests/client/android/test_client_android_registrar.cpp

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/gbm/test_native_surface.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_platform.cpp

tests/unit-tests/graphics/android/test_internal_client.cpp

tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp

tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp

tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/surfaces/test_surface.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/copyright

debian/libmirclient-dev.install

debian/libmirclient1.install

debian/libmirprotobuf-dev.install

debian/libmirprotobuf0.install

debian/libmirserver-dev.install

debian/libmirserver0.install

debian/mir-demos.install

debian/mir-test-tools.install

debian/mir-test-tools.lintian-overrides

debian/mircommon-dev.install

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo_client_accelerated.cpp

examples/eglapp.c

examples/render_to_fb.cpp

guides/CMakeLists.txt

include/client/mir_toolkit/mir_client_library.h

include/server/mir/compositor/buffer_allocation_strategy.h

include/server/mir/compositor/buffer_stream_surfaces.h

include/server/mir/compositor/swapper_factory.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/communicator_report.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/surface.h

include/server/mir/graphics/display.h

include/server/mir/graphics/display_configuration.h

include/server/mir/graphics/gl_pixel_buffer.h

include/server/mir/graphics/gl_renderer.h

include/server/mir/graphics/platform.h

include/server/mir/graphics/renderable.h

include/server/mir/graphics/renderer.h

include/server/mir/shared_library.h

include/server/mir/shell/application_session.h

include/server/mir/shell/pixel_buffer.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/snapshot.h

include/server/mir/shell/snapshot_strategy.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_buffer_access.h

include/server/mir/shell/threaded_snapshot_strategy.h

include/server/mir/surfaces/buffer_stream.h

include/server/mir/surfaces/surface.h

include/shared/mir/graphics/android/mir_native_buffer.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test/test_protobuf_server.h

include/test/mir_test_doubles/mock_android_registrar.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_client_surface.h

include/test/mir_test_doubles/mock_gl.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/mock_swapper_factory.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/null_snapshot_strategy.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_surface.h

src/client/CMakeLists.txt

src/client/android/android_client_buffer.cpp

src/client/android/android_client_buffer.h

src/client/android/android_client_buffer_factory.cpp

src/client/android/android_registrar.cpp

src/client/android/android_registrar.h

src/client/android/android_registrar_gralloc.h

src/client/lttng/CMakeLists.txt

src/client/mir_client_library.cpp

src/client/mir_client_surface.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/rendering_operator.cpp

src/server/compositor/swapper_factory.cpp

src/server/compositor/switching_bundle.cpp

src/server/default_server_configuration.cpp

src/server/frontend/make_protobuf_socket_communicator.cpp

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/protobuf_socket_communicator.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/graphics/CMakeLists.txt

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_alloc_adaptor.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/internal_client_window.cpp

src/server/graphics/gbm/CMakeLists.txt

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_display.h

src/server/graphics/gbm/gbm_platform.cpp

src/server/graphics/gbm/internal_native_surface.cpp

src/server/graphics/gbm/kms_display_configuration.cpp

src/server/graphics/gbm/kms_display_configuration.h

src/server/graphics/gbm/linux_virtual_terminal.cpp

src/server/graphics/gbm/linux_virtual_terminal.h

src/server/graphics/gl_pixel_buffer.cpp

src/server/graphics/gl_renderer.cpp

src/server/logging/glog_logger.cpp

src/server/lttng/CMakeLists.txt

src/server/shared_library.cpp

src/server/shell/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/shell/threaded_snapshot_strategy.cpp

src/server/surfaces/surface.cpp

src/shared/CMakeLists.txt

src/shared/graphics/android/CMakeLists.txt

src/shared/graphics/android/mir_native_buffer.cpp

src/shared/lttng/CMakeLists.txt

src/shared/lttng/tracepoint_provider.cpp

src/shared/protobuf/CMakeLists.txt

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/shell/CMakeLists.txt

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/CMakeLists.txt

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/android/test_client_android_buffer.cpp

tests/unit-tests/client/android/test_client_android_registrar.cpp

tests/unit-tests/client/android/test_client_surface_interpreter.cpp

tests/unit-tests/client/gbm/test_native_surface.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_platform.cpp

tests/unit-tests/graphics/android/test_external_refcount.cpp

tests/unit-tests/graphics/android/test_internal_client.cpp

tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp

tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp

tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/test_gl_pixel_buffer.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

tests/unit-tests/shared_library_test.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp

tests/unit-tests/surfaces/test_surface.cpp

Older »