← Back to branch summary

~ps-jenkins/mir/latestsnapshot-0.0.14+13.10.20131009.4-0ubuntu1

~ps-jenkins/mir/latestsnapshot-0.0.14+13.10.20131009.4-0ubuntu1

Viewing all changes in revision 1086.

Committer: Tarmac
Author(s): Kevin DuBois, Daniel d'Andrada, Michael Terry
Date: 2013-09-29 22:37:47 UTC
mfrom: (1081.3.13 development-branch)
Revision ID: tarmac-20130929223747-6fw3xl5bph3ta3so

merge latest dev branch.

Approved by PS Jenkins bot, Alan Griffiths, Kevin DuBois.

files added:
include/test/mir_test_framework/stub_client_connection_configuration.h

include/test/mir_test_framework/testing_client_configuration.h

tests/mir_test_framework/testing_client_options.cpp

files modified:
3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_process_manager.h

src/client/mir_client_library.cpp

src/server/graphics/android/hwc_common_device.cpp

src/server/options/program_option.cpp

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaceloop.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/testing_process_manager.cpp

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

tests/unit-tests/logging/test_legacy_input_report.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/stub_client_connection_configuration.h

include/test/mir_test_framework/testing_client_configuration.h

include/test/mir_test_framework/testing_process_manager.h

src/client/mir_client_library.cpp

src/server/graphics/android/hwc_common_device.cpp

src/server/options/program_option.cpp

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaceloop.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/testing_client_options.cpp

tests/mir_test_framework/testing_process_manager.cpp

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

tests/unit-tests/logging/test_legacy_input_report.cpp

Older »