← Back to branch summary

~mir-team/mir/0.7

~mir-team/mir/0.7

Viewing all changes in revision 1769.1.15.

Committer: Daniel van Vugt
Date: 2014-07-21 03:35:31 UTC
mfrom: (1779 development-branch)
mto: This revision was merged to the branch mainline in revision 1784.
Revision ID: daniel.van.vugt@canonical.com-20140721033531-hofhs85mz01hufoj

Merge latest development-branch

files added:
src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

files renamed:
debian/libmirserver23.install => debian/libmirserver24.install

src/client/rpc/mir_socket_rpc_channel.cpp => src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h => src/client/rpc/mir_protobuf_rpc_channel.h

files modified:
CMakeLists.txt

cmake/src/mir/mir_discover_gtest_tests.cpp

debian/control

examples/fingerpaint.c

include/client/mir_toolkit/mir_surface.h

include/server/mir/frontend/surface.h

include/shared/mir_toolkit/common.h

include/test/mir_test/auto_unblock_thread.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_rpc_report.h

include/test/mir_test_doubles/stub_scene_surface.h

src/client/logging/rpc_report.cpp

src/client/logging/rpc_report.h

src/client/lttng/rpc_report.cpp

src/client/lttng/rpc_report.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/rpc/CMakeLists.txt

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/null_rpc_report.cpp

src/client/rpc/null_rpc_report.h

src/client/rpc/rpc_report.h

src/server/CMakeLists.txt

src/server/compositor/buffer_queue.cpp

src/server/frontend/session_mediator.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Show diffs side-by-side

added added

removed removed

cmake/src/mir/mir_discover_gtest_tests.cpp

debian/libmirserver24.install

examples/fingerpaint.c

include/client/mir_toolkit/mir_surface.h

include/server/mir/frontend/surface.h

include/shared/mir_toolkit/common.h

include/test/mir_test/auto_unblock_thread.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_rpc_report.h

include/test/mir_test_doubles/stub_scene_surface.h

src/client/logging/rpc_report.cpp

src/client/logging/rpc_report.h

src/client/lttng/rpc_report.cpp

src/client/lttng/rpc_report.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/rpc/CMakeLists.txt

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/rpc/null_rpc_report.cpp

src/client/rpc/null_rpc_report.h

src/client/rpc/rpc_report.h

src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

src/server/CMakeLists.txt

src/server/compositor/buffer_queue.cpp

src/server/frontend/session_mediator.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Older »