lp://staging/~kdub/mir/detect-demo-decorations

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/mir

Daniel van Vugt: Needs Resubmitting on 2014-07-21

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-07-18

Diff: 334 lines (+174/-11)

10 files modified

examples/demo-shell/CMakeLists.txt (+6/-2)
examples/demo-shell/demo_compositor.cpp (+38/-6)
examples/demo-shell/demo_compositor.h (+5/-2)
examples/demo-shell/demo_shell.cpp (+1/-1)
include/test/mir_test_doubles/mock_display_buffer.h (+2/-0)
include/test/mir_test_doubles/mock_gl.h (+1/-0)
tests/mir_test_doubles/mock_gl.cpp (+6/-0)
tests/unit-tests/CMakeLists.txt (+2/-0)
tests/unit-tests/examples/CMakeLists.txt (+5/-0)
tests/unit-tests/examples/test_demo_compositor.cpp (+108/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1699. By Kevin DuBois on 2014-07-18

make a type richer

1698. By Kevin DuBois on 2014-07-18

remerge in fix base branch, because bzr cant tfigure out the history here apparently

1697. By Kevin DuBois on 2014-07-18

merge devel

1696. By Kevin DuBois on 2014-07-18

test to pass

1695. By Kevin DuBois on 2014-07-18

work through some problems to see the test fail

1694. By Kevin DuBois on 2014-07-18

make it possible to statically link the test binary to the demo shell code

1693. By Kevin DuBois on 2014-07-18

add test that checks the demo shell compositor

1692. By Kevin DuBois on 2014-07-18

merge devel, fix conflicts

1691. By Kevin DuBois on 2014-07-09

fix clang

1690. By Kevin DuBois on 2014-07-08

more cleanups