← Back to branch summary

~vanvugt/mir/double

~vanvugt/mir/double

Viewing all changes in revision 1771.

Committer: Daniel van Vugt
Date: 2014-09-02 09:47:26 UTC
mfrom: (1608.120.129 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140902094726-09bk7chfv53u0zyf

Merge latest development-branch and fix conflicts.

files added:
common-ABI-sha1sums

doc/android_new_device_bringup.md

platform-ABI-sha1sums

src/platform/symbols.map

src/server/frontend/surface_tracker.cpp

src/server/frontend/surface_tracker.h

src/server/symbols.map

src/shared/symbols.map

tests/unit-tests/examples/test_demo_compositor.cpp

tools/process_doxygen_xml.py

tools/update-all-ABI-sha1sums.sh

files removed:
tools/update-client-sha1sums.sh

tools/update-server-sha1sums.sh

files renamed:
debian/libmircommon2.install => debian/libmircommon1.install

files modified:
CMakeLists.txt

benchmarks/android-input/CMakeLists.txt

cmake/MirCommon.cmake

debian/changelog

debian/control

debian/rules

doc/Doxyfile.in

doc/android_technical_details.md

doc/mainpage.md

examples/basic.c

examples/demo-shell/demo_compositor.cpp

examples/demo-shell/demo_compositor.h

examples/demo-shell/demo_renderer.cpp

examples/eglapp.c

examples/fingerpaint.c

examples/multiwin.c

examples/progressbar.c

examples/scroll.cpp

include/platform/mir/graphics/buffer.h

include/platform/mir/graphics/buffer_id.h

include/server/mir/compositor/recently_used_cache.h

include/shared/mir/graphics/android/mir_native_window.h

include/test/mir_test/client_event_matchers.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_framework/basic_client_server_fixture.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_process_manager.h

server-ABI-sha1sums

src/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/connection_configuration.h

src/client/default_connection_configuration.cpp

src/client/default_connection_configuration.h

src/client/lttng/CMakeLists.txt

src/client/mesa/CMakeLists.txt

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/rpc/CMakeLists.txt

src/platform/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/buffer_basic.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/server/CMakeLists.txt

src/server/compositor/recently_used_cache.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/client_buffer_tracker.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/scene/rendering_tracker.cpp

src/server/scene/rendering_tracker.h

src/server/scene/surface_stack.cpp

src/shared/CMakeLists.txt

src/shared/graphics/android/mir_native_window.cpp

src/shared/input/android/android_input_receiver.cpp

src/shared/input/android/android_input_receiver.h

src/utils/ping.c

src/utils/screencast.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_large_messages.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_stale_frames.cpp

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/server_runner.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/performance-tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

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

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_gl_texture_cache.cpp

tests/unit-tests/examples/CMakeLists.txt

tests/unit-tests/frontend/test_client_buffer_tracker.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/test_buffer_id.cpp

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

tests/unit-tests/scene/test_rendering_tracker.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tools/install_on_android.sh

Show diffs side-by-side

added added

removed removed

benchmarks/android-input/CMakeLists.txt

cmake/MirCommon.cmake

common-ABI-sha1sums

debian/changelog

debian/libmircommon1.install

doc/Doxyfile.in

doc/android_new_device_bringup.md

doc/android_technical_details.md

doc/mainpage.md

examples/basic.c

examples/demo-shell/demo_compositor.cpp

examples/demo-shell/demo_compositor.h

examples/demo-shell/demo_renderer.cpp

examples/eglapp.c

examples/fingerpaint.c

examples/multiwin.c

examples/progressbar.c

examples/scroll.cpp

include/platform/mir/graphics/buffer.h

include/platform/mir/graphics/buffer_id.h

include/server/mir/compositor/recently_used_cache.h

include/shared/mir/graphics/android/mir_native_window.h

include/test/mir_test/client_event_matchers.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_framework/basic_client_server_fixture.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_process_manager.h

platform-ABI-sha1sums

server-ABI-sha1sums

src/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/connection_configuration.h

src/client/default_connection_configuration.cpp

src/client/default_connection_configuration.h

src/client/lttng/CMakeLists.txt

src/client/mesa/CMakeLists.txt

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/rpc/CMakeLists.txt

src/platform/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/buffer_basic.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/server/CMakeLists.txt

src/server/compositor/recently_used_cache.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/client_buffer_tracker.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/surface_tracker.cpp

src/server/frontend/surface_tracker.h

src/server/scene/rendering_tracker.cpp

src/server/scene/rendering_tracker.h

src/server/scene/surface_stack.cpp

src/server/symbols.map

src/shared/CMakeLists.txt

src/shared/graphics/android/mir_native_window.cpp

src/shared/input/android/android_input_receiver.cpp

src/shared/input/android/android_input_receiver.h

src/shared/symbols.map

src/utils/ping.c

src/utils/screencast.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_authorization.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_large_messages.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_stale_frames.cpp

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/mock_gl.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/server_runner.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/performance-tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

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

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_gl_texture_cache.cpp

tests/unit-tests/examples/CMakeLists.txt

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/frontend/test_client_buffer_tracker.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/test_buffer_id.cpp

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

tests/unit-tests/scene/test_rendering_tracker.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tools/install_on_android.sh

tools/process_doxygen_xml.py

tools/update-all-ABI-sha1sums.sh

tools/update-client-sha1sums.sh

tools/update-server-sha1sums.sh

Older »