← Back to branch summary

~mir-team/mir/fix-1546933-3

~mir-team/mir/fix-1546933-3

Viewing all changes in revision 3368.

Committer: Daniel van Vugt
Date: 2016-03-03 07:24:16 UTC
mfrom: (3324.1.34 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20160303072416-u3u60nx38bu4wpgq

Merge latest trunk

files removed:
deploy-and-test.sh

doc/avoid_deploy-and-test.md

files modified:
cmake/MirCommon.cmake

include/test/mir_test_framework/placement_applying_shell.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/mir_connection.cpp

src/client/no_tls_future-inl.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/server/compositor/stream.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/mir_test_framework/placement_applying_shell.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

Show diffs side-by-side

added added

removed removed

cmake/MirCommon.cmake

deploy-and-test.sh

doc/avoid_deploy-and-test.md

include/test/mir_test_framework/placement_applying_shell.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/mir_connection.cpp

src/client/no_tls_future-inl.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/server/compositor/stream.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/mir_test_framework/placement_applying_shell.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

Older »