← Back to branch summary

~vanvugt/mir/fix-1378706

~vanvugt/mir/fix-1378706

Viewing all changes in revision 1957.1.3.

Committer: Daniel van Vugt
Date: 2014-10-06 03:02:44 UTC
mfrom: (1961 mir-dev)
mto: This revision was merged to the branch mainline in revision 1962.
Revision ID: daniel.van.vugt@canonical.com-20141006030244-3iv3e5skrf81kmwo

Merge latest development-branch

files renamed:
playground/render_overlays.cpp => examples/render_overlays.cpp

playground/testdraw/ => examples/testdraw/

files modified:
debian/changelog

examples/CMakeLists.txt

playground/CMakeLists.txt

src/client/rpc/stream_socket_transport.cpp

src/common/fd/fd_socket_transmission.cpp

src/common/symbols.map

src/include/common/mir/fd_socket_transmission.h

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

examples/CMakeLists.txt

playground/CMakeLists.txt

src/client/rpc/stream_socket_transport.cpp

src/common/fd/fd_socket_transmission.cpp

src/common/symbols.map

src/include/common/mir/fd_socket_transmission.h

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

Older »