← Back to branch summary

~vanvugt/mir/prepre

~vanvugt/mir/prepre

Viewing all changes in revision 2547.

Committer: Daniel van Vugt
Date: 2015-05-07 01:59:11 UTC
mfrom: (2541.2.3 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20150507015911-h9uxxcjbpdvu0pu1

Merge latest trunk

files modified:
src/include/server/mir/scene/buffer_stream_factory.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

tests/include/mir_test_doubles/stub_buffer_stream_factory.h

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/scene/test_application_session.cpp

Show diffs side-by-side

added added

removed removed

src/include/server/mir/scene/buffer_stream_factory.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

tests/include/mir_test_doubles/stub_buffer_stream_factory.h

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/scene/test_application_session.cpp

Older »