Viewing all changes in revision 1743.
- Committer: Christopher James Halse Rogers
- Date: 2014-12-01 04:11:41 UTC
- mfrom: (1680.15.410 dev)
- Revision ID: christopher.halse.rogers@canonical.com-20141201041141-x52n0r1hxyuiffna
Merge trunk
- files added:
- benchmarks/frame-uniformity
- include/client/mir_toolkit/debug
- include/common/mir/logging
- src/include/client
- src/include/client/mir
- src/include/client/mir/client
- files removed:
- examples/basic_server_configuration.cpp
- include/client/mir
- include/client/mir/client
- src/include/server/mir/logging
- src/server/logging
- tests/unit-tests/draw
- files renamed:
- debian/libmirclientplatform-android.install => debian/libmirclient8driver-android.install
- debian/libmirclientplatform-mesa.install => debian/libmirclient8driver-mesa.install
- debian/libmircommon2.install => debian/libmircommon3.install
- debian/libmirplatform3.install => debian/libmirplatform4.install
- debian/libmirplatformgraphics-android.install => debian/libmirplatform4driver-android.install
- debian/libmirplatformgraphics-mesa.install => debian/libmirplatform4driver-mesa.install
- debian/libmirserver25.install => debian/libmirserver28.install
- doc/building_source_for_android.md => doc/building_source_for_arm.md
- src/server/logging/glog_logger.cpp => examples/glog_logger.cpp
- src/include/server/mir/logging/glog_logger.h => examples/glog_logger.h
- playground/render_overlays.cpp => examples/render_overlays.cpp
- include/client/mir_toolkit/mir_client_library_debug.h => include/client/mir_toolkit/debug/surface.h
- src/include/common/mir/geometry/displacement.h => include/common/mir/geometry/displacement.h
- src/include/common/mir/geometry/forward.h => include/common/mir/geometry/forward.h
- src/include/common/mir/geometry/length.h => include/common/mir/geometry/length.h
- src/include/common/mir/logging/logger.h => include/common/mir/logging/logger.h
- src/include/platform/mir/fatal.h => include/platform/mir/fatal.h
- src/include/platform/mir/graphics/buffer_basic.h => include/platform/mir/graphics/buffer_basic.h
- src/include/platform/mir/graphics/buffer_writer.h => include/platform/mir/graphics/buffer_writer.h
- src/include/platform/mir/graphics/cursor.h => include/platform/mir/graphics/cursor.h
- src/include/platform/mir/graphics/cursor_image.h => include/platform/mir/graphics/cursor_image.h
- src/include/platform/mir/graphics/native_platform.h => include/platform/mir/graphics/native_platform.h
- src/include/platform/mir/graphics/platform_ipc_package.h => include/platform/mir/graphics/platform_ipc_package.h
- src/include/server/mir/compositor/compositor_id.h => include/server/mir/compositor/compositor_id.h
- src/include/server/mir/compositor/display_buffer_compositor.h => include/server/mir/compositor/display_buffer_compositor.h
- src/include/server/mir/compositor/display_buffer_compositor_factory.h => include/server/mir/compositor/display_buffer_compositor_factory.h
- src/include/server/mir/compositor/scene.h => include/server/mir/compositor/scene.h
- src/include/server/mir/compositor/scene_element.h => include/server/mir/compositor/scene_element.h
- src/include/server/mir/emergency_cleanup.h => include/server/mir/emergency_cleanup.h
- src/include/server/mir/frontend/display_changer.h => include/server/mir/frontend/display_changer.h
- src/include/server/mir/frontend/event_sink.h => include/server/mir/frontend/event_sink.h
- src/include/server/mir/frontend/screencast.h => include/server/mir/frontend/screencast.h
- src/include/server/mir/frontend/session_mediator_report.h => include/server/mir/frontend/session_mediator_report.h
- src/include/server/mir/input/cursor_images.h => include/server/mir/input/cursor_images.h
- src/include/server/mir/input/input_manager.h => include/server/mir/input/input_manager.h
- src/include/server/mir/scene/null_session_listener.h => include/server/mir/scene/null_session_listener.h
- src/include/server/mir/scene/observer.h => include/server/mir/scene/observer.h
- src/include/server/mir/shell/host_lifecycle_event_listener.h => include/server/mir/shell/host_lifecycle_event_listener.h
- examples/server_configuration.cpp => playground/server_configuration.cpp
- examples/server_configuration.h => playground/server_configuration.h
- src/common/time/high_resolution_clock.cpp => src/common/time/steady_clock.cpp
- include/client/mir/client/private.h => src/include/client/mir/client/private.h
- include/common/mir/time/clock.h => src/include/common/mir/time/clock.h
- src/include/common/mir/time/high_resolution_clock.h => src/include/common/mir/time/steady_clock.h
- src/include/platform/mir/graphics/buffer_ipc_packer.h => src/include/platform/mir/graphics/buffer_ipc_message.h
- include/server/mir/frontend/connection_creator.h => src/include/server/mir/frontend/connection_creator.h
- include/server/mir/frontend/connections.h => src/include/server/mir/frontend/connections.h
- include/server/mir/frontend/fd_sets.h => src/include/server/mir/frontend/fd_sets.h
- include/server/mir/frontend/message_processor.h => src/include/server/mir/frontend/message_processor.h
- include/server/mir/frontend/protobuf_connection_creator.h => src/include/server/mir/frontend/protobuf_connection_creator.h
- include/server/mir/frontend/protobuf_message_sender.h => src/include/server/mir/frontend/protobuf_message_sender.h
- include/server/mir/frontend/template_protobuf_message_processor.h => src/include/server/mir/frontend/template_protobuf_message_processor.h
- src/platform/graphics/android/android_buffer_writer.cpp => src/platform/graphics/android/buffer_writer.cpp
- src/platform/graphics/android/android_buffer_writer.h => src/platform/graphics/android/buffer_writer.h
- src/platform/graphics/android/android_display.cpp => src/platform/graphics/android/display.cpp
- src/platform/graphics/android/android_display.h => src/platform/graphics/android/display.h
- src/platform/graphics/android/android_display_configuration.cpp => src/platform/graphics/android/display_configuration.cpp
- src/platform/graphics/android/android_display_configuration.h => src/platform/graphics/android/display_configuration.h
- src/platform/graphics/android/android_platform.cpp => src/platform/graphics/android/platform.cpp
- src/platform/graphics/android/android_platform.h => src/platform/graphics/android/platform.h
- src/common/protobuf/ => src/protobuf/
- tests/client-language/c89.c => tests/client-language/c99.c
- tests/include/mir_test_doubles/mock_buffer_packer.h => tests/include/mir_test_doubles/mock_buffer_ipc_message.h
- playground/testdraw/android_graphics_region_factory.cpp => tests/integration-tests/graphics/android/android_graphics_region_factory.cpp
- playground/testdraw/draw_pattern_checkered-inl.h => tests/integration-tests/graphics/android/draw_pattern_checkered-inl.h
- playground/testdraw/graphics_region_factory.h => tests/integration-tests/graphics/android/graphics_region_factory.h
- playground/testdraw/patterns.cpp => tests/integration-tests/graphics/android/patterns.cpp
- playground/testdraw/patterns.h => tests/integration-tests/graphics/android/patterns.h
- tests/integration-tests/client/test_client_render.cpp => tests/integration-tests/graphics/android/test_client_render.cpp
- playground/testdraw/ => tests/integration-tests/graphics/android/testdraw/
- tests/acceptance-tests/test_client_surface_swap_buffers.cpp => tests/integration-tests/test_client_surface_swap_buffers.cpp
- tests/acceptance-tests/test_large_messages.cpp => tests/integration-tests/test_large_messages.cpp
- tests/acceptance-tests/test_macros.cpp => tests/integration-tests/test_macros.cpp
- tests/acceptance-tests/test_protobuf.cpp => tests/integration-tests/test_protobuf.cpp
- tests/acceptance-tests/test_protobuf.proto => tests/integration-tests/test_protobuf.proto
- tests/acceptance-tests/test_stale_frames.cpp => tests/integration-tests/test_stale_frames.cpp
- tests/acceptance-tests/test_test_framework.cpp => tests/integration-tests/test_test_framework.cpp
- tests/unit-tests/graphics/android/test_android_fb.cpp => tests/unit-tests/graphics/android/test_display.cpp
- tests/unit-tests/graphics/android/test_hwc_display.cpp => tests/unit-tests/graphics/android/test_display_buffer.cpp
- tests/unit-tests/graphics/android/test_android_platform.cpp => tests/unit-tests/graphics/android/test_platform.cpp
- tests/unit-tests/test_basic_observers.cpp => tests/unit-tests/test_thread_safe_list.cpp
- files modified:
- 3rd_party/CMakeLists.txt
expand all
collapse all
added
removed
