← Back to branch summary

~vanvugt/mir/unfreeze-2

~vanvugt/mir/unfreeze-2

Viewing all changes in revision 2061.1.13.

Committer: Alan Griffiths
Date: 2014-11-22 11:19:02 UTC
mfrom: (2093 development-branch)
mto: This revision was merged to the branch mainline in revision 2094.
Revision ID: alan@octopull.co.uk-20141122111902-zw8155kbre9dau13

merge lp:mir

files added:
src/platform/graphics/mesa/drm_authentication.h

src/platform/graphics/mesa/nested_authentication.cpp

src/platform/graphics/mesa/nested_authentication.h

tests/include/mir_test_doubles/null_logger.h

tests/mir_test_doubles/null_logger.cpp

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

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

files renamed:
doc/building_source_for_android.md => doc/building_source_for_arm.md

files modified:
CMakeLists.txt

common-ABI-sha1sums

doc/demo_shell_controls.md

doc/mainpage.md

include/common/mir/logging/logger.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_shell.cpp

playground/demo-shell/window_manager.cpp

playground/demo-shell/window_manager.h

server-ABI-sha1sums

src/client/CMakeLists.txt

src/common/CMakeLists.txt

src/common/logging/logger.cpp

src/platform/CMakeLists.txt

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/display_helpers.h

src/platform/graphics/mesa/ipc_operations.cpp

src/platform/graphics/mesa/ipc_operations.h

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/server/CMakeLists.txt

tests/include/mir_test_framework/command_line_server_configuration.h

tests/include/mir_test_framework/stubbed_server_configuration.h

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/command_line_server_configuration.cpp

tests/mir_test_framework/headless_test.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

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

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

Show diffs side-by-side

added added

removed removed

common-ABI-sha1sums

doc/building_source_for_arm.md

doc/demo_shell_controls.md

doc/mainpage.md

include/common/mir/logging/logger.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_shell.cpp

playground/demo-shell/window_manager.cpp

playground/demo-shell/window_manager.h

server-ABI-sha1sums

src/client/CMakeLists.txt

src/common/CMakeLists.txt

src/common/logging/logger.cpp

src/platform/CMakeLists.txt

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/display_helpers.h

src/platform/graphics/mesa/drm_authentication.h

src/platform/graphics/mesa/ipc_operations.cpp

src/platform/graphics/mesa/ipc_operations.h

src/platform/graphics/mesa/native_platform.cpp

src/platform/graphics/mesa/native_platform.h

src/platform/graphics/mesa/nested_authentication.cpp

src/platform/graphics/mesa/nested_authentication.h

src/server/CMakeLists.txt

tests/include/mir_test_doubles/null_logger.h

tests/include/mir_test_framework/command_line_server_configuration.h

tests/include/mir_test_framework/stubbed_server_configuration.h

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/null_logger.cpp

tests/mir_test_framework/command_line_server_configuration.cpp

tests/mir_test_framework/headless_test.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

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

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

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

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

Older »