lp:~vanvugt/mir/frontend-server

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Robert Carr (community): Disapprove on 2014-04-21

PS Jenkins bot (community): Approve (continuous-integration) on 2014-04-15

Chris Halse Rogers: Abstain on 2014-04-02

Andreas Pokorny (community): Needs Fixing on 2014-04-01

Kevin DuBois (community): Needs Information (needs discussion) on 2014-02-25

Alan Griffiths: Needs Fixing on 2014-02-21

Alexandros Frantzis (community): Needs Information on 2014-02-21

Diff: 666 lines (+75/-77)

20 files modified

examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp (+1/-1)
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+5/-5)
examples/demo-inprocess-surface-client/inprocess_egl_client.h (+3/-3)
include/server/mir/default_server_configuration.h (+3/-3)
include/server/mir/frontend/server.h (+8/-8)
include/server/mir/server_configuration.h (+0/-1)
include/test/mir_test_doubles/mock_server.h (+5/-5)
include/test/mir_test_doubles/stub_server.h (+6/-6)
src/server/frontend/default_configuration.cpp (+7/-7)
src/server/frontend/session_mediator.cpp (+7/-7)
src/server/frontend/session_mediator.h (+3/-3)
src/server/scene/default_configuration.cpp (+2/-2)
src/server/scene/session_manager.h (+2/-2)
tests/acceptance-tests/test_protobuf.cpp (+1/-1)
tests/integration-tests/session_management.cpp (+2/-2)
tests/integration-tests/test_error_reporting.cpp (+1/-1)
tests/mir_test_framework/input_testing_server_options.cpp (+0/-1)
tests/unit-tests/frontend/test_session_mediator.cpp (+9/-9)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+5/-5)
tests/unit-tests/frontend/test_session_mediator_mesa.cpp (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1444. By Daniel van Vugt on 2014-04-15

Fix more (soft) conflicts from recent changes

1443. By Daniel van Vugt on 2014-04-15

Merge latest development-branch and fix conflicts

1442. By Daniel van Vugt on 2014-04-03

Merge latest development-branch

1441. By Daniel van Vugt on 2014-04-02

Merge latest development-branch

1440. By Daniel van Vugt on 2014-04-01

Merge latest development-branch

1439. By Daniel van Vugt on 2014-03-28

Merge latest development-branch

1438. By Daniel van Vugt on 2014-03-27

Merge latest development-branch

1437. By Daniel van Vugt on 2014-03-26

Merge latest development-branch

1436. By Daniel van Vugt on 2014-03-25

Merge latest development-branch

1435. By Daniel van Vugt on 2014-03-24

Merge latest development-branch and resolve a conflict.