← Back to branch summary

~andreas-pokorny/mir/use-ld-preload-in-test-script

~andreas-pokorny/mir/use-ld-preload-in-test-script

Viewing all changes in revision 440.1.101.

Committer: Daniel van Vugt
Date: 2013-03-13 04:54:15 UTC
mfrom: (493 trunk)
mto: This revision was merged to the branch mainline in revision 526.
Revision ID: daniel.van.vugt@canonical.com-20130313045415-7hi608meaybiafx0

Merge latest lp:mir

files added:
examples/eglapp.c

examples/eglapp.h

examples/eglflash.c

examples/eglplasma.c

examples/egltriangle.c

include/mir_test_doubles/mock_session_store.h

include/mir_test_doubles/mock_surface.h

include/mir_test_doubles/stub_session.h

include/mir_test_doubles/stub_session_store.h

src/client/android/android_driver_interpreter.h

src/client/android/client_surface_interpreter.cpp

src/client/android/client_surface_interpreter.h

tests/unit-tests/client/test_client_surface_interpreter.cpp

files modified:
CMakeLists.txt

cross-compile-chroot.sh

debian/libmirclient-demos.install

debian/rules

examples/CMakeLists.txt

include/mir_test_doubles/mock_session.h

src/client/CMakeLists.txt

src/client/android/android_client_platform.cpp

src/client/android/mir_native_window.cpp

src/client/android/mir_native_window.h

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_android_native_window.cpp

tests/unit-tests/frontend/test_application_mediator.cpp

tests/unit-tests/frontend/test_application_mediator_android.cpp

tests/unit-tests/frontend/test_application_mediator_gbm.cpp

tests/unit-tests/shell/test_application_session.cpp

Show diffs side-by-side

added added

removed removed

cross-compile-chroot.sh

debian/libmirclient-demos.install

examples/CMakeLists.txt

examples/eglapp.c

examples/eglapp.h

examples/eglflash.c

examples/eglplasma.c

examples/egltriangle.c

include/mir_test_doubles/mock_session.h

include/mir_test_doubles/mock_session_store.h

include/mir_test_doubles/mock_surface.h

include/mir_test_doubles/stub_session.h

include/mir_test_doubles/stub_session_store.h

src/client/CMakeLists.txt

src/client/android/android_client_platform.cpp

src/client/android/android_driver_interpreter.h

src/client/android/client_surface_interpreter.cpp

src/client/android/client_surface_interpreter.h

src/client/android/mir_native_window.cpp

src/client/android/mir_native_window.h

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_android_native_window.cpp

tests/unit-tests/client/test_client_surface_interpreter.cpp

tests/unit-tests/frontend/test_application_mediator.cpp

tests/unit-tests/frontend/test_application_mediator_android.cpp

tests/unit-tests/frontend/test_application_mediator_gbm.cpp

tests/unit-tests/shell/test_application_session.cpp

Older »