← Back to branch summary

~vanvugt/mir/frontend-server

~vanvugt/mir/frontend-server

Viewing all changes in revision 1426.

Committer: Daniel van Vugt
Date: 2014-03-11 04:27:30 UTC
mfrom: (1416.1.43 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140311042730-885xmim7i3sm4zga

Merge latest development-branch

files modified:
examples/image_renderer.cpp

examples/render_surfaces.cpp

include/test/mir_test_doubles/fake_renderable.h

src/server/compositor/gl_renderer.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/scene/basic_surface.cpp

Show diffs side-by-side

added added

removed removed

examples/image_renderer.cpp

examples/render_surfaces.cpp

include/test/mir_test_doubles/fake_renderable.h

src/server/compositor/gl_renderer.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/scene/basic_surface.cpp

Older »