← Back to branch summary

~vanvugt/mir/optional-callbacks

~vanvugt/mir/optional-callbacks

Viewing all changes in revision 409.

Committer: Daniel van Vugt
Date: 2013-02-21 13:36:00 UTC
mfrom: (407.1.30 trunk)
Revision ID: daniel.van.vugt@canonical.com-20130221133600-tsgd3sdit7nybzcd

Merge latest lp:mir

files added:
3rd_party/android-input/android/frameworks/base/include/std/properties.h

debian/libmirserver-dev.install

debian/libmirserver0.install

include/mir/sessions/application_session.h

include/mir/sessions/surface_id.h

include/mir_test_cucumber

include/mir_test_doubles/mock_display_listener.h

src/graphics/gbm/kms_page_flipper.cpp

src/graphics/gbm/kms_page_flipper.h

src/graphics/gbm/page_flipper.h

src/mirserver.pc.in

tests/integration-tests/cucumber

tests/integration-tests/cucumber/CMakeLists.txt

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/unit-tests/android_input/sha1.cpp

tests/unit-tests/android_input/string8.cpp

tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp

files removed:
3rd_party/android-input/android/frameworks/base/include/std/Unicode.h

3rd_party/android-input/android/frameworks/base/include/std/threads.h

files renamed:
tests/behavior-tests/session_management_context.h => include/mir_test_cucumber/session_management_context.h

src/sessions/session.cpp => src/sessions/application_session.cpp

tests/unit-tests/sessions/test_session.cpp => tests/unit-tests/sessions/test_application_session.cpp

files modified:
3rd_party/android-input/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h

3rd_party/android-input/android/frameworks/base/include/androidfw/VirtualKeyMap.h

3rd_party/android-input/android/frameworks/base/include/std/Condition.h

3rd_party/android-input/android/frameworks/base/include/std/Errors.h

3rd_party/android-input/android/frameworks/base/include/std/Log.h

3rd_party/android-input/android/frameworks/base/include/std/Looper.h

3rd_party/android-input/android/frameworks/base/include/std/Mutex.h

3rd_party/android-input/android/frameworks/base/include/std/PropertyMap.h

3rd_party/android-input/android/frameworks/base/include/std/RefBase.h

3rd_party/android-input/android/frameworks/base/include/std/SortedVector.h

3rd_party/android-input/android/frameworks/base/include/std/String8.h

3rd_party/android-input/android/frameworks/base/include/std/Thread.h

3rd_party/android-input/android/frameworks/base/include/std/ThreadDefs.h

3rd_party/android-input/android/frameworks/base/include/std/Vector.h

3rd_party/android-input/android/frameworks/base/include/std/atomic.h

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

3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

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

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

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

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

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

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

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

3rd_party/android-input/android/frameworks/native/include/android/input.h

3rd_party/android-input/android/frameworks/native/include/utils/Looper.h

3rd_party/android-input/android/frameworks/native/include/utils/String8.h

3rd_party/android-input/android/frameworks/native/libs/utils/String8.cpp

3rd_party/android-input/tools/CMakeLists.txt

3rd_party/android-input/tools/dispatcher_check.cpp

CMakeLists.txt

HACKING.md

cross-compile-chroot.sh

debian/changelog

debian/control

debian/libmirclient-dev.install

examples/CMakeLists.txt

examples/render_surfaces.cpp

include/mir/server_configuration.h

include/mir/sessions/session.h

include/mir_test/gl_mock.h

include/mir_test/wait_condition.h

include/mir_test_framework/display_server_test_fixture.h

include/mir_test_framework/testing_server_configuration.h

src/CMakeLists.txt

src/compositor/CMakeLists.txt

src/display_server.cpp

src/draw/graphics_utils.cpp

src/frontend/CMakeLists.txt

src/frontend/application_mediator_android.cpp

src/frontend/application_mediator_gbm.cpp

src/frontend/make_protobuf_binder_communicator.cpp

src/frontend/make_protobuf_socket_communicator.cpp

src/graphics/android/CMakeLists.txt

src/graphics/gbm/CMakeLists.txt

src/graphics/gbm/gbm_display.cpp

src/graphics/gbm/gbm_display.h

src/graphics/gbm/gbm_display_buffer.cpp

src/graphics/gbm/gbm_display_buffer.h

src/graphics/gbm/gbm_display_helpers.cpp

src/graphics/gbm/gbm_display_helpers.h

src/graphics/gbm/kms_output.cpp

src/graphics/gbm/kms_output.h

src/graphics/gbm/kms_output_container.cpp

src/graphics/gbm/kms_output_container.h

src/main.cpp

src/protobuf/google_protobuf_guard.cpp

src/server_configuration.cpp

src/sessions/CMakeLists.txt

src/sessions/session_manager.cpp

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_focus_management_api.cpp

tests/behavior-tests/CMakeLists.txt

tests/behavior-tests/session_management_context.cpp

tests/death-tests/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/frontend/test_application_listener.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/test_configuring_input_manager.cpp

tests/integration-tests/process/test_signal_dispatcher.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/CMakeLists.txt

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/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/CMakeLists.txt

tests/unit-tests/graphics/gbm/mock_drm.cpp

tests/unit-tests/graphics/gbm/mock_drm.h

tests/unit-tests/graphics/gbm/mock_gbm.h

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_kms_output.cpp

tests/unit-tests/sessions/CMakeLists.txt

tests/unit-tests/sessions/test_registration_order_focus_sequence.cpp

tests/unit-tests/sessions/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/sessions/test_the_session_container_implementation.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h

3rd_party/android-input/android/frameworks/base/include/androidfw/VirtualKeyMap.h

3rd_party/android-input/android/frameworks/base/include/std/Condition.h

3rd_party/android-input/android/frameworks/base/include/std/Errors.h

3rd_party/android-input/android/frameworks/base/include/std/Log.h

3rd_party/android-input/android/frameworks/base/include/std/Looper.h

3rd_party/android-input/android/frameworks/base/include/std/Mutex.h

3rd_party/android-input/android/frameworks/base/include/std/PropertyMap.h

3rd_party/android-input/android/frameworks/base/include/std/RefBase.h

3rd_party/android-input/android/frameworks/base/include/std/SortedVector.h

3rd_party/android-input/android/frameworks/base/include/std/String8.h

3rd_party/android-input/android/frameworks/base/include/std/Thread.h

3rd_party/android-input/android/frameworks/base/include/std/ThreadDefs.h

3rd_party/android-input/android/frameworks/base/include/std/Unicode.h

3rd_party/android-input/android/frameworks/base/include/std/Vector.h

3rd_party/android-input/android/frameworks/base/include/std/atomic.h

3rd_party/android-input/android/frameworks/base/include/std/properties.h

3rd_party/android-input/android/frameworks/base/include/std/threads.h

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

3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

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

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

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

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

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

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

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

3rd_party/android-input/android/frameworks/native/include/android/input.h

3rd_party/android-input/android/frameworks/native/include/utils/Looper.h

3rd_party/android-input/android/frameworks/native/include/utils/String8.h

3rd_party/android-input/android/frameworks/native/libs/utils/String8.cpp

3rd_party/android-input/tools/CMakeLists.txt

3rd_party/android-input/tools/dispatcher_check.cpp

cross-compile-chroot.sh

debian/changelog

debian/libmirclient-dev.install

debian/libmirserver-dev.install

debian/libmirserver0.install

examples/CMakeLists.txt

examples/render_surfaces.cpp

include/mir/server_configuration.h

include/mir/sessions/application_session.h

include/mir/sessions/session.h

include/mir/sessions/surface_id.h

include/mir_test/gl_mock.h

include/mir_test/wait_condition.h

include/mir_test_cucumber/

include/mir_test_cucumber/session_management_context.h

include/mir_test_doubles/mock_display_listener.h

include/mir_test_framework/display_server_test_fixture.h

include/mir_test_framework/testing_server_configuration.h

src/CMakeLists.txt

src/compositor/CMakeLists.txt

src/display_server.cpp

src/draw/graphics_utils.cpp

src/frontend/CMakeLists.txt

src/frontend/application_mediator_android.cpp

src/frontend/application_mediator_gbm.cpp

src/frontend/make_protobuf_binder_communicator.cpp

src/frontend/make_protobuf_socket_communicator.cpp

src/graphics/android/CMakeLists.txt

src/graphics/gbm/CMakeLists.txt

src/graphics/gbm/gbm_display.cpp

src/graphics/gbm/gbm_display.h

src/graphics/gbm/gbm_display_buffer.cpp

src/graphics/gbm/gbm_display_buffer.h

src/graphics/gbm/gbm_display_helpers.cpp

src/graphics/gbm/gbm_display_helpers.h

src/graphics/gbm/kms_output.cpp

src/graphics/gbm/kms_output.h

src/graphics/gbm/kms_output_container.cpp

src/graphics/gbm/kms_output_container.h

src/graphics/gbm/kms_page_flipper.cpp

src/graphics/gbm/kms_page_flipper.h

src/graphics/gbm/page_flipper.h

src/mirserver.pc.in

src/protobuf/google_protobuf_guard.cpp

src/server_configuration.cpp

src/sessions/CMakeLists.txt

src/sessions/application_session.cpp

src/sessions/session_manager.cpp

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_focus_management_api.cpp

tests/behavior-tests/CMakeLists.txt

tests/behavior-tests/session_management_context.cpp

tests/death-tests/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/cucumber/

tests/integration-tests/cucumber/CMakeLists.txt

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/integration-tests/frontend/test_application_listener.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/test_configuring_input_manager.cpp

tests/integration-tests/process/test_signal_dispatcher.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/CMakeLists.txt

tests/unit-tests/android_input/sha1.cpp

tests/unit-tests/android_input/string8.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/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/CMakeLists.txt

tests/unit-tests/graphics/gbm/mock_drm.cpp

tests/unit-tests/graphics/gbm/mock_drm.h

tests/unit-tests/graphics/gbm/mock_gbm.h

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_kms_output.cpp

tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp

tests/unit-tests/sessions/CMakeLists.txt

tests/unit-tests/sessions/test_application_session.cpp

tests/unit-tests/sessions/test_registration_order_focus_sequence.cpp

tests/unit-tests/sessions/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/sessions/test_the_session_container_implementation.cpp

Older »