← Back to branch summary

~vanvugt/mir/event-queue

~vanvugt/mir/event-queue

Viewing all changes in revision 1416.1.6.

Committer: Daniel van Vugt
Date: 2014-02-24 03:38:45 UTC
mfrom: (1419 development-branch)
mto: This revision was merged to the branch mainline in revision 1425.
Revision ID: daniel.van.vugt@canonical.com-20140224033845-hgl98pwv1zvxt56m

Merge latest development-branch

files added:
tools/valgrind_suppressions_armhf

files removed:
src/server/scene/surface_data.cpp

src/server/scene/surface_data.h

files renamed:
tests/unit-tests/scene/test_surface_data.cpp => tests/unit-tests/scene/test_basic_surface.cpp

files modified:
CMakeLists.txt

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/mesa/native_surface.cpp

src/client/mesa/native_surface.h

src/server/scene/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/mutable_surface_state.h

src/server/scene/surface_allocator.cpp

src/server/scene/surface_impl.cpp

src/server/scene/surface_stack.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_udev_wrapper.cpp

Show diffs side-by-side

added added

removed removed

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/mesa/native_surface.cpp

src/client/mesa/native_surface.h

src/server/scene/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/mutable_surface_state.h

src/server/scene/surface_allocator.cpp

src/server/scene/surface_data.cpp

src/server/scene/surface_data.h

src/server/scene/surface_impl.cpp

src/server/scene/surface_stack.cpp

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/test_udev_wrapper.cpp

tools/valgrind_suppressions_armhf

Older »