← Back to branch summary

~kdub/mir/anativewindow-external-refcount

~kdub/mir/anativewindow-external-refcount

Viewing all changes in revision 752.3.1.

Committer: Eleni Maria Stea
Date: 2013-06-19 09:57:32 UTC
mfrom: (740.2.11 mir.dest-tmp)
mto: (752.1.7 trunk)
mto: This revision was merged to the branch mainline in revision 774.
Revision ID: elene.mst@gmail.com-20130619095732-susdxgebzuc7h7u6

local merge to trunk

files modified:
3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp

3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp

3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp

CMakeLists.txt

include/server/mir/compositor/buffer_allocation_strategy.h

include/server/mir/compositor/buffer_stream_surfaces.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/graphics/display.h

include/server/mir/graphics/display_report.h

include/server/mir/graphics/platform.h

include/server/mir/graphics/viewable_area.h

include/server/mir/options/option.h

include/server/mir/server_configuration.h

include/server/mir/surfaces/buffer_stream.h

include/test/mir_test_doubles/mock_android_alloc_device.h

include/test/mir_test_doubles/mock_android_registrar.h

include/test/mir_test_framework/testing_process_manager.h

src/client/aging_buffer.h

src/client/android/android_registrar.h

src/client/client_platform.h

src/server/compositor/rw_lock.h

src/server/frontend/message_processor.h

src/server/frontend/socket_session.cpp

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_platform.cpp

tests/integration-tests/compositor/multithread_harness.h

tests/unit-tests/client/android/test_client_android_registrar.cpp

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

tests/unit-tests/test_gmock_fixes.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp

3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp

3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp

include/server/mir/compositor/buffer_allocation_strategy.h

include/server/mir/compositor/buffer_stream_surfaces.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/graphics/display.h

include/server/mir/graphics/display_report.h

include/server/mir/graphics/platform.h

include/server/mir/graphics/viewable_area.h

include/server/mir/options/option.h

include/server/mir/server_configuration.h

include/server/mir/surfaces/buffer_stream.h

include/test/mir_test_doubles/mock_android_alloc_device.h

include/test/mir_test_doubles/mock_android_registrar.h

include/test/mir_test_framework/testing_process_manager.h

src/client/aging_buffer.h

src/client/android/android_registrar.h

src/client/client_platform.h

src/server/compositor/rw_lock.h

src/server/frontend/message_processor.h

src/server/frontend/socket_session.cpp

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_platform.cpp

tests/integration-tests/compositor/multithread_harness.h

tests/unit-tests/client/android/test_client_android_registrar.cpp

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

tests/unit-tests/test_gmock_fixes.cpp

Older »