← Back to branch summary

~vanvugt/mir/fatal-error

~vanvugt/mir/fatal-error

Viewing all changes in revision 1660.

Committer: Daniel van Vugt
Date: 2014-07-14 06:49:52 UTC
mfrom: (1623.1.145 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140714064952-elrz0oaocc2krb1x

Merge latest development-branch and fix a conflict.

files added:
tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/unit-tests/test_basic_observers.cpp

files modified:
include/shared/mir/basic_observers.h

include/test/mir_test_doubles/mock_hwc_device_wrapper.h

src/platform/graphics/android/hwc_common_device.cpp

src/platform/graphics/android/hwc_common_device.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_wrapper.h

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

src/platform/graphics/android/resource_factory.cpp

src/server/asio_main_loop.cpp

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

tests/acceptance-tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_queue.cpp

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

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

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

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

tests/unit-tests/test_asio_main_loop.cpp

Show diffs side-by-side

added added

removed removed

include/shared/mir/basic_observers.h

include/test/mir_test_doubles/mock_hwc_device_wrapper.h

src/platform/graphics/android/hwc_common_device.cpp

src/platform/graphics/android/hwc_common_device.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fb_device.cpp

src/platform/graphics/android/hwc_fb_device.h

src/platform/graphics/android/hwc_wrapper.h

src/platform/graphics/android/real_hwc_wrapper.cpp

src/platform/graphics/android/real_hwc_wrapper.h

src/platform/graphics/android/resource_factory.cpp

src/server/asio_main_loop.cpp

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_queue.cpp

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

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

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

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

tests/unit-tests/test_asio_main_loop.cpp

tests/unit-tests/test_basic_observers.cpp

Older »