← Back to branch summary

~vanvugt/mir/fatal-error

~vanvugt/mir/fatal-error

Viewing all changes in revision 1644.

Committer: Daniel van Vugt
Date: 2014-05-16 06:26:59 UTC
mfrom: (1623.1.10 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140516062659-5iyu69v1mau465ge

Merge latest development-branch

files added:
tests/performance-tests

tests/performance-tests/CMakeLists.txt

tests/performance-tests/test_glmark2-es2-mir.cpp

files modified:
debian/mir-test-tools.install

examples/render_overlays.cpp

src/platform/graphics/android/hwc_layers.cpp

tests/CMakeLists.txt

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

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

Show diffs side-by-side

added added

removed removed

debian/mir-test-tools.install

examples/render_overlays.cpp

src/platform/graphics/android/hwc_layers.cpp

tests/CMakeLists.txt

tests/performance-tests/

tests/performance-tests/CMakeLists.txt

tests/performance-tests/test_glmark2-es2-mir.cpp

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

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

Older »