← Back to branch summary

~kdub/mir/privatize-get-buffer-package

~kdub/mir/privatize-get-buffer-package

Viewing all changes in revision 3951.

Committer: Cemil Azizoglu
Date: 2017-02-01 18:11:34 UTC
mfrom: (3919.1.83 development-branch)
Revision ID: cemil.azizoglu@canonical.com-20170201181134-dtvn996bdt2442ri

merge lp:mir, fix conflict

files added:
tests/include/mir/test/doubles/mock_input_config_changer.h

files renamed:
debian/libmirserver43.install => debian/libmirserver44.install

files modified:
CMakeLists.txt

debian/control

include/client/mir_toolkit/mir_connection.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/symbols.map

src/include/common/mir/protobuf/display_server.h

src/include/server/mir/default_server_configuration.h

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/server/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/input/default_configuration.cpp

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/symbols.map

tests/acceptance-tests/test_client_input.cpp

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

tests/include/mir/test/stub_server_tool.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

Show diffs side-by-side

added added

removed removed

debian/libmirserver44.install

include/client/mir_toolkit/mir_connection.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/symbols.map

src/include/common/mir/protobuf/display_server.h

src/include/server/mir/default_server_configuration.h

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/server/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/input/default_configuration.cpp

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/symbols.map

tests/acceptance-tests/test_client_input.cpp

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

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

tests/include/mir/test/stub_server_tool.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

Older »