~raof/mir/manual-connection-dispatch
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/mir/client
-
include/client/mir/client
-
src/include/server/mir/logging
-
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/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/server/mir/compositor/compositor_id.h
=>
include/server/mir/compositor/compositor_id.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/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.h
=>
playground/server_configuration.h
-
include/client/mir/client/private.h
=>
src/include/client/mir/client/private.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/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/common/protobuf/
=>
src/protobuf/
-
playground/testdraw/draw_pattern_checkered-inl.h
=>
tests/integration-tests/graphics/android/draw_pattern_checkered-inl.h
-
playground/testdraw/
=>
tests/integration-tests/graphics/android/testdraw/
-
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.proto
=>
tests/integration-tests/test_protobuf.proto
expand all
collapse all
Show diffs side-by-side
added
removed