← Back to branch summary

~afrantzis/mir/fix-1576760-increase-timeout

~afrantzis/mir/fix-1576760-increase-timeout

Viewing all changes in revision 3503.3.6.

Committer: Kevin DuBois
Date: 2016-06-28 11:38:55 UTC
mfrom: (3561 development-branch)
mto: This revision was merged to the branch mainline in revision 3564.
Revision ID: kevin.dubois@canonical.com-20160628113855-4hwkrajb92qpgnle

merge in mir

files added:
playground/mir_demo_client_chain_jumping_buffers.c

tests/acceptance-tests/test_confined_pointer.cpp

files renamed:
debian/libmircommon5.install => debian/libmircommon6.install

debian/libmirserver39.install => debian/libmirserver40.install

files modified:
debian/control

examples/server_example_canonical_window_manager.cpp

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/abstract_shell.h

include/test/mir/test/doubles/stub_surface.h

playground/CMakeLists.txt

src/client/mir_connection.cpp

src/common/CMakeLists.txt

src/include/server/mir/input/seat.h

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

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/frontend/session_mediator.cpp

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_allocator.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/canonical_window_manager.cpp

src/server/shell/default_configuration.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_surface_placement.cpp

tests/include/mir/test/doubles/mock_input_seat.h

tests/include/mir/test/doubles/mock_surface.h

tests/include/mir/test/doubles/stub_scene_surface.h

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/stub_surface.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

debian/libmircommon6.install

debian/libmirserver40.install

examples/server_example_canonical_window_manager.cpp

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/abstract_shell.h

include/test/mir/test/doubles/stub_surface.h

playground/CMakeLists.txt

playground/mir_demo_client_chain_jumping_buffers.c

src/client/mir_connection.cpp

src/common/CMakeLists.txt

src/include/server/mir/input/seat.h

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

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/frontend/session_mediator.cpp

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_allocator.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/canonical_window_manager.cpp

src/server/shell/default_configuration.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_surface_placement.cpp

tests/include/mir/test/doubles/mock_input_seat.h

tests/include/mir/test/doubles/mock_surface.h

tests/include/mir/test/doubles/stub_scene_surface.h

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/stub_surface.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Older »