lp:~unity-team/unity-api/silo0

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:unity-api

Unity Team: Pending requested 2015-08-05

Diff: 526 lines (+401/-11)

10 files modified

debian/changelog (+33/-2)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/Mir.h (+93/-0)
include/unity/shell/application/MirSurfaceInterface.h (+113/-0)
include/unity/shell/application/MirSurfaceItemInterface.h (+151/-0)
include/unity/shell/scopes/CMakeLists.txt (+1/-1)
include/unity/shell/scopes/ScopeInterface.h (+2/-2)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp (+4/-2)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h (+2/-2)
test/qmltest/unity/shell/scopes/tst_Scopes.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

183. By Gerry Boland on 2015-08-13

Merge unity-api trunk-15.04

182. By Gerry Boland on 2015-08-12

edit changelog to unrelease, keep train happy

181. By Gerry Boland on 2015-08-12

Merge unity-api trunk

180. By Gerry Boland on 2015-08-06

Fake changelog entry to satisfy train

179. By Gerry Boland on 2015-08-05

Merge mousePointer

178. By CI Train Bot Account on 2015-07-24

Releasing 7.98+15.10.20150724-0ubuntu1

177. By Mirco Müller on 2015-07-24

Added alert-API to LauncherItemInterface and LauncherModelInterface to allow applications to trigger a wiggle/peeking-animation on their launcher-icon to draw users attention.
Approved by: PS Jenkins bot, Michael Zanetti

176. By CI Train Bot Account on 2015-07-21

Releasing 7.97+15.10.20150721-0ubuntu1

175. By Michi Henning on 2015-07-21

Remove dependency on gcc 4.9. Fixes: #1452342
Approved by: Marcus Tomlinson, PS Jenkins bot, Matthias Klose

174. By CI Train Bot Account on 2015-06-11

Releasing 7.97+15.10.20150611-0ubuntu1