← Back to branch summary

~mir-team/mir/saucy

~mir-team/mir/saucy

Viewing all changes in revision 1097.3.3.

Committer: Daniel van Vugt
Date: 2013-10-03 03:44:08 UTC
mfrom: (1102 development-branch)
mto: This revision was merged to the branch mainline in revision 1106.
Revision ID: daniel.van.vugt@canonical.com-20131003034408-vb5avueysrkl30rs

Merge latest development-branch

files renamed:
include/server/mir/surfaces/surface_data.h => src/server/surfaces/surface_data.h

files modified:
cross-compile-chroot.sh

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/stub_display_support_provider.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_wait_handle.cpp

src/client/mir_wait_handle.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/server/graphics/android/android_display.cpp

src/server/graphics/android/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_device.h

src/server/surfaces/surface_allocator.cpp

src/server/surfaces/surface_data.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/surfaces/test_surface_data.cpp

Show diffs side-by-side

added added

removed removed

cross-compile-chroot.sh

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/stub_display_support_provider.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_wait_handle.cpp

src/client/mir_wait_handle.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/server/graphics/android/android_display.cpp

src/server/graphics/android/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_device.h

src/server/surfaces/surface_allocator.cpp

src/server/surfaces/surface_data.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/surfaces/test_surface_data.cpp

Older »