← Back to branch summary

~albaguirre/mir/backport-fixes-to-0.11

~albaguirre/mir/backport-fixes-to-0.11

Viewing all changes in revision 2215.3.26.

Committer: Kevin DuBois
Date: 2015-01-27 16:57:54 UTC
mfrom: (2265 development-branch)
mto: This revision was merged to the branch mainline in revision 2277.
Revision ID: kevin.dubois@canonical.com-20150127165754-ceqnrf9wyxscrtds

merge in mir again

files added:
tests/unit-tests/scene/test_default_shell.cpp

files modified:
include/server/mir/frontend/shell.h

include/server/mir/scene/placement_strategy.h

include/server/mir/scene/session_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session_coordinator_wrapper.h

server-ABI-sha1sums

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

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

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/test_default_shell.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/frontend/shell.h

include/server/mir/scene/placement_strategy.h

include/server/mir/scene/session_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session_coordinator_wrapper.h

server-ABI-sha1sums

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

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

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/test_default_shell.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_default_shell.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

Older »