lp:unity-system-compositor/0.1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-system-compositor/ubuntu at revision 221

PS Jenkins bot (community): Approve (continuous-integration) on 2015-09-30

Unity System Compositor Development Team: Pending requested 2015-09-30

Diff: 614 lines (+364/-19) (has conflicts)

9 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+16/-3)
src/mir_screen.cpp (+47/-10)
src/mir_screen.h (+6/-2)
src/power_state_change_reason.h (+3/-1)
src/server.cpp (+6/-1)
src/server.h (+14/-0)
tests/integration-tests/test_deadlock_lp1491566.cpp (+1/-0)
tests/unit-tests/test_mir_screen.cpp (+270/-1)

api

Merged into lp:~unity-system-compositor-team/unity-system-compositor/wily at revision 213

Unity System Compositor Development Team: Pending requested 2015-09-02

Diff: 290 lines (+160/-12)

6 files modified

CMakeLists.txt (+1/-1)
debian/10-unity-system-compositor.conf (+1/-1)
debian/changelog (+17/-0)
spinner/miregl.cpp (+0/-1)
src/mir_screen.cpp (+18/-4)
tests/unit-tests/test_mir_screen.cpp (+123/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

259. By Alexandros Frantzis on 2015-09-30

Update files for release 0.1.4

258. By Alexandros Frantzis on 2015-09-30

Merge r254 from trunk

257. By Alexandros Frantzis on 2015-09-29

Sync debian/changelog with version from released package

256. By Alexandros Frantzis on 2015-09-25

Merge fix for LP #1491566 from trunk

255. By Alexandros Frantzis on 2015-09-25

Sync debian/changelog with package version

254. By Cemil Azizoglu on 2015-09-22

Update version in the changelog

253. By Cemil Azizoglu on 2015-09-22

Use the original make_event()

252. By Cemil Azizoglu on 2015-09-15

update version to 0.12

251. By Cemil Azizoglu on 2015-09-15

Merge trunk

250. By Alexandros Frantzis on 2015-09-11

Sync debian/changelog with version from released package