lp:~mir-team/platform-api/expose-mir-connection

Branch merges

Merged into lp:platform-api at revision 296

Gerry Boland: Approve on 2015-02-05

PS Jenkins bot: Approve (continuous-integration) on 2015-02-04

Alberto Aguirre: Approve on 2015-02-04

Albert Astals Cid (community): Abstain on 2015-02-02

Diff: 619 lines (+166/-32)

23 files modified

CMakeLists.txt (+5/-2)
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/libubuntu-application-api2.symbols (+2/-1)
include/ubuntu/application/instance.h (+15/-0)
include/ubuntu/application/ui/clipboard.h (+7/-0)
include/ubuntu/application/ui/form_factor.h (+5/-0)
include/ubuntu/application/ui/options.h (+9/-2)
include/ubuntu/application/ui/session.h (+12/-3)
include/ubuntu/application/ui/stage.h (+5/-0)
include/ubuntu/application/ui/window.h (+22/-4)
include/ubuntu/application/ui/window_orientation.h (+5/-0)
include/ubuntu/application/ui/window_parent.h (+19/-7)
include/ubuntu/application/ui/window_properties.h (+19/-5)
include/ubuntu/application/ui/window_state.h (+5/-0)
include/ubuntu/application/ui/window_type.h (+5/-0)
src/ubuntu/application/base_module.h (+2/-2)
src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp (+7/-0)
src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp (+7/-0)
src/ubuntu/application/desktop/module_version.h (+2/-2)
src/ubuntu/application/testbackend/module_version.h (+2/-2)
src/ubuntu/application/touch/module_version.h (+2/-2)
src/ubuntu/application/ubuntu_application_api.cpp (+1/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

301. By Michał Sawicz on 2015-03-18

Merge lp:platform-api

300. By Alberto Aguirre on 2015-02-04

update versions

299. By Alberto Aguirre on 2015-02-04

merge lp:platform-api, fix changelog conflict

298. By Alberto Aguirre on 2015-02-04

update symbols

297. By Robert Carr <racarr@ocelot> on 2015-02-02

Merge lp:papi

296. By Robert Carr on 2015-01-28

Fix changelog version

295. By Robert Carr on 2015-01-26

Again

294. By Robert Carr on 2015-01-26

Correct version bump

293. By Robert Carr on 2015-01-26

Merge trunk

292. By Robert Carr on 2015-01-26

Update minor version, package version and add mirclient dependency to devpackage