← Back to branch summary

~vanvugt/mir/log-level

~vanvugt/mir/log-level

Viewing all changes in revision 2228.

Committer: Daniel van Vugt
Date: 2015-01-23 03:08:41 UTC
mfrom: (2201.2.50 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20150123030841-zn39cao9um2o9x0p

Merge latest trunk

files added:
src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

files removed:
tests/integration-tests/test_client_surface_swap_buffers.cpp

files renamed:
tests/integration-tests/test_session_manager.cpp => tests/integration-tests/test_default_shell.cpp

files modified:
CMakeLists.txt

client-ABI-sha1sums

cmake/FindGtest.cmake

examples/fingerpaint.c

include/client/mir_toolkit/mir_surface.h

include/server/mir/scene/session_coordinator.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/session_coordinator_wrapper.h

server-ABI-sha1sums

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/symbols.map

src/include/server/mir/default_server_configuration.h

src/protobuf/mir_protobuf.proto

src/server/frontend/session_mediator.cpp

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_creation_parameters.cpp

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/session_coordinator_wrapper.cpp

src/server/symbols.map

src/wrapper.c

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_mirsurface.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/scene/test_session_manager.cpp

Show diffs side-by-side

added added

removed removed

client-ABI-sha1sums

cmake/FindGtest.cmake

examples/fingerpaint.c

include/client/mir_toolkit/mir_surface.h

include/server/mir/scene/session_coordinator.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/session_coordinator_wrapper.h

server-ABI-sha1sums

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/symbols.map

src/include/server/mir/default_server_configuration.h

src/protobuf/mir_protobuf.proto

src/server/frontend/session_mediator.cpp

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_creation_parameters.cpp

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

src/server/shell/session_coordinator_wrapper.cpp

src/server/symbols.map

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/test_client_surface_swap_buffers.cpp

tests/integration-tests/test_default_shell.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/scene/test_session_manager.cpp

Older »