← Back to branch summary

~kdub/mir/nested-db-link-to-streams

~kdub/mir/nested-db-link-to-streams

Viewing all changes in revision 2484.

Committer: Kevin DuBois
Date: 2015-04-14 16:56:20 UTC
mfrom: (2477.2.4 development-branch)
Revision ID: kevin.dubois@canonical.com-20150414165620-6jpiimnxfaunhgkx

merge mir

files added:
doc/kernel_requirements.md

src/server/input/android/input_reader_dispatchable.cpp

src/server/input/android/input_reader_dispatchable.h

tests/include/mir_test_doubles/mock_event_hub.h

tests/include/mir_test_doubles/mock_input_reader.h

tests/unit-tests/input/android/test_input_reader_dispatchable.cpp

files removed:
src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

files renamed:
tests/unit-tests/input/android/test_android_input_manager.cpp => tests/unit-tests/input/android/test_android_input_channel_factory.cpp

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

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

include/common/mir/dispatch/simple_dispatch_thread.h

include/common/mir/optional_value.h

src/common/dispatch/simple_dispatch_thread.cpp

src/common/geometry/ostream.cpp

src/common/logging/input_timestamp.cpp

src/common/logging/logger.cpp

src/include/server/mir/default_server_configuration.h

src/include/server/mir/server_configuration.h

src/platform/graphics/platform_probe.cpp

src/platform/udev/udev_wrapper.cpp

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/hal_component_factory.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/kms_page_flipper.cpp

src/platforms/mesa/server/real_kms_output.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/recently_used_cache.cpp

src/server/display_server.cpp

src/server/glib_main_loop_sources.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/input/android/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/run_mir.cpp

src/server/scene/basic_surface.cpp

src/server/scene/default_session_container.cpp

src/server/scene/prompt_session_container.cpp

src/server/symbols.map

tests/include/mir_test/fake_event_hub.h

tests/mir_test_doubles/fake_event_hub.cpp

tests/unit-tests/dispatch/test_simple_dispatch_thread.cpp

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

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/test_default_input_manager.cpp

Show diffs side-by-side

added added

removed removed

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

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

doc/kernel_requirements.md

include/common/mir/dispatch/simple_dispatch_thread.h

include/common/mir/optional_value.h

src/common/dispatch/simple_dispatch_thread.cpp

src/common/geometry/ostream.cpp

src/common/logging/input_timestamp.cpp

src/common/logging/logger.cpp

src/include/server/mir/default_server_configuration.h

src/include/server/mir/server_configuration.h

src/platform/graphics/platform_probe.cpp

src/platform/udev/udev_wrapper.cpp

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/hal_component_factory.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/kms_page_flipper.cpp

src/platforms/mesa/server/real_kms_output.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/recently_used_cache.cpp

src/server/display_server.cpp

src/server/glib_main_loop_sources.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

src/server/input/android/input_reader_dispatchable.cpp

src/server/input/android/input_reader_dispatchable.h

src/server/input/default_configuration.cpp

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/run_mir.cpp

src/server/scene/basic_surface.cpp

src/server/scene/default_session_container.cpp

src/server/scene/prompt_session_container.cpp

src/server/symbols.map

tests/include/mir_test/fake_event_hub.h

tests/include/mir_test_doubles/mock_event_hub.h

tests/include/mir_test_doubles/mock_input_reader.h

tests/mir_test_doubles/fake_event_hub.cpp

tests/unit-tests/dispatch/test_simple_dispatch_thread.cpp

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

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_channel_factory.cpp

tests/unit-tests/input/android/test_input_reader_dispatchable.cpp

tests/unit-tests/input/test_default_input_manager.cpp

Older »