← Back to branch summary

~albaguirre/mir/fix-1285215

~albaguirre/mir/fix-1285215

Viewing all changes in revision 1542.

Committer: Alberto Aguirre
Date: 2014-04-08 14:38:27 UTC
mfrom: (1537.1.4 development-branch)
Revision ID: alberto.aguirre@canonical.com-20140408143827-via2ic0tisu0uy4f

merge lp:mir/devel

files added:
tests/integration-tests/session_management.cpp

files modified:
include/server/mir/compositor/scene.h

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_surface.h

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/server/shell/default_focus_mechanism.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/CMakeLists.txt

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/compositor/scene.h

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_surface.h

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/server/shell/default_focus_mechanism.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/session_management.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Older »