← Back to branch summary

~mir-team/mir/vsync-timings-from-server

~mir-team/mir/vsync-timings-from-server

Viewing all changes in revision 2035.

Committer: Robert Carr
Date: 2014-11-18 19:29:30 UTC
mfrom: (2002.1.68 development-branch)
Revision ID: robert.carr@canonical.com-20141118192930-xpb9b5192rkk0c2a

Merge lp:mir

files added:
src/common/logging/logger.cpp

tests/mir_test_doubles/stub_buffer.cpp

files removed:
src/include/platform/mir/graphics/drm_authenticator.h

src/include/server/mir/logging

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/platform/mir/graphics/native_platform.h

platform-ABI-sha1sums

server-ABI-sha1sums

src/common/logging/CMakeLists.txt

src/common/symbols.map

src/include/common/mir/logging/logger.h

src/include/server/mir/glib_main_loop.h

src/platform/graphics/android/platform.cpp

src/platform/graphics/android/platform.h

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/platform/shared_library_loader.cpp

src/platform/symbols.map

src/server/frontend/session_mediator.cpp

src/server/glib_main_loop.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/server.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/include/mir_test_doubles/stub_buffer.h

tests/integration-tests/test_drm_auth_magic.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/unit-tests/android_input/test_eventhub.cpp

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

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

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

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

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

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_native_platform.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/nested/test_nested_platform.cpp

tests/unit-tests/test_glib_main_loop.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

include/platform/mir/graphics/native_platform.h

platform-ABI-sha1sums

server-ABI-sha1sums

src/common/logging/CMakeLists.txt

src/common/logging/logger.cpp

src/common/symbols.map

src/include/common/mir/logging/logger.h

src/include/platform/mir/graphics/drm_authenticator.h

src/include/server/mir/glib_main_loop.h

src/include/server/mir/logging/

src/platform/graphics/android/platform.cpp

src/platform/graphics/android/platform.h

src/platform/graphics/mesa/cursor.cpp

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/platform/shared_library_loader.cpp

src/platform/symbols.map

src/server/frontend/session_mediator.cpp

src/server/glib_main_loop.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/server.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/include/mir_test_doubles/stub_buffer.h

tests/integration-tests/test_drm_auth_magic.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/stub_buffer.cpp

tests/unit-tests/android_input/test_eventhub.cpp

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

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

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

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

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

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_native_platform.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/nested/test_nested_platform.cpp

tests/unit-tests/test_glib_main_loop.cpp

Older »