lp:~vanvugt/mir/wm

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:mir

PS Jenkins bot (community): Approve (continuous-integration) on 2014-11-24

Alberto Aguirre (community): Needs Information on 2014-11-21

Alan Griffiths: Disapprove on 2014-11-20

Kevin DuBois (community): Needs Information on 2014-11-20

Diff: 1246 lines (+211/-178)

34 files modified

debian/control (+2/-2)
debian/libmirserver28.install (+1/-1)
include/server/mir/default_server_configuration.h (+3/-3)
include/server/mir/server.h (+9/-4)
include/server/mir/shell/window_manager.h (+17/-12)
playground/demo-shell/CMakeLists.txt (+2/-2)
playground/demo-shell/demo_shell.cpp (+14/-14)
playground/demo-shell/event_filter.cpp (+8/-8)
playground/demo-shell/event_filter.h (+8/-8)
playground/demo-shell/fullscreen_wm.cpp (+3/-3)
playground/demo-shell/fullscreen_wm.h (+9/-9)
server-ABI-sha1sums (+3/-3)
src/server/CMakeLists.txt (+1/-1)
src/server/scene/default_configuration.cpp (+1/-1)
src/server/scene/surface_controller.cpp (+4/-4)
src/server/scene/surface_controller.h (+3/-3)
src/server/server.cpp (+1/-8)
src/server/shell/CMakeLists.txt (+1/-1)
src/server/shell/default_configuration.cpp (+5/-5)
src/server/shell/default_window_manager.cpp (+3/-3)
src/server/shell/default_window_manager.h (+9/-9)
src/server/symbols.map (+11/-11)
tests/acceptance-tests/test_client_cursor_api.cpp (+4/-4)
tests/acceptance-tests/test_client_input.cpp (+4/-4)
tests/acceptance-tests/test_debug_api.cpp (+6/-7)
tests/include/mir_test_doubles/null_window_manager.h (+38/-0)
tests/include/mir_test_framework/declarative_window_manager.h (+11/-11)
tests/integration-tests/graphics/android/test_internal_client.cpp (+4/-10)
tests/integration-tests/test_session.cpp (+0/-1)
tests/mir_test_framework/CMakeLists.txt (+1/-1)
tests/mir_test_framework/declarative_window_manager.cpp (+6/-6)
tests/unit-tests/scene/test_surface_controller.cpp (+13/-13)
tests/unit-tests/shell/CMakeLists.txt (+1/-1)
tests/unit-tests/shell/test_default_window_manager.cpp (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2094. By Daniel van Vugt on 2014-11-24

And fix a typo

2093. By Daniel van Vugt on 2014-11-24

Fix merge mistakes

2092. By Daniel van Vugt on 2014-11-24

Merge latest trunk and fix conflicts.

2091. By Daniel van Vugt on 2014-11-21

Fix conflicts properly

2090. By Daniel van Vugt on 2014-11-21

Merge latest trunk and fix conflicts.

2089. By Daniel van Vugt on 2014-11-21

Merge latest trunk

2088. By Daniel van Vugt on 2014-11-20

Merge latest trunk

2087. By Daniel van Vugt on 2014-11-20

Bump the server ABI too.

2086. By Daniel van Vugt on 2014-11-20

Merge branch "series-0.10"

2085. By Daniel van Vugt on 2014-11-20

Resolved TODO