← Back to branch summary

~vanvugt/mir/handoff

~vanvugt/mir/handoff

Viewing all changes in revision 2820.

Committer: Daniel van Vugt
Date: 2015-08-12 09:52:57 UTC
mfrom: (2798.1.41 trunk)
Revision ID: daniel.van.vugt@canonical.com-20150812095257-58wduov90c2mpiqs

Merge latest trunk

files added:
src/platforms/mesa/server/x11/graphics.cpp

src/platforms/mesa/server/x11/lazy_connection.h

files removed:
src/platforms/mesa/server/x11/xserver_connection.h

files modified:
CMakeLists.txt

examples/CMakeLists.txt

examples/mir_demo_server_loader.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

src/include/server/mir/shell/canonical_window_manager.h

src/platforms/mesa/server/x11/CMakeLists.txt

src/platforms/mesa/server/x11/input/dispatchable.cpp

src/platforms/mesa/server/x11/input/dispatchable.h

src/platforms/mesa/server/x11/input/input.cpp

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/platforms/mesa/server/x11/input/input_platform.h

src/platforms/mesa/server/x11/platform.cpp

src/platforms/mesa/server/x11/platform.h

src/server/graphics/software_cursor.cpp

src/server/shell/canonical_window_manager.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/mir_test_doubles/platform_factory.cpp

tests/unit-tests/graphics/test_software_cursor.cpp

tests/unit-tests/input/test_x11_dispatchable.cpp

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/mir_demo_server_loader.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

src/include/server/mir/shell/canonical_window_manager.h

src/platforms/mesa/server/x11/CMakeLists.txt

src/platforms/mesa/server/x11/graphics.cpp

src/platforms/mesa/server/x11/input/dispatchable.cpp

src/platforms/mesa/server/x11/input/dispatchable.h

src/platforms/mesa/server/x11/input/input.cpp

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/platforms/mesa/server/x11/input/input_platform.h

src/platforms/mesa/server/x11/lazy_connection.h

src/platforms/mesa/server/x11/platform.cpp

src/platforms/mesa/server/x11/platform.h

src/platforms/mesa/server/x11/xserver_connection.h

src/server/graphics/software_cursor.cpp

src/server/shell/canonical_window_manager.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/mir_test_doubles/platform_factory.cpp

tests/unit-tests/graphics/test_software_cursor.cpp

tests/unit-tests/input/test_x11_dispatchable.cpp

Older »