Merge lp://staging/~unity-team/unity8/rtm-20150113 into lp://staging/unity8/rtm-14.09

Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1425
Merged at revision: 1413
Proposed branch: lp://staging/~unity-team/unity8/rtm-20150113
Merge into: lp://staging/unity8/rtm-14.09
Prerequisite: lp://staging/~unity-team/unity8/rtm-20150108
Diff against target: 298 lines (+63/-55)
7 files modified
debian/changelog (+16/-2)
qml/Dash/Dash.qml (+1/-2)
qml/Stages/PhoneStage.qml (+17/-33)
qml/Stages/TabletStage.qml (+5/-14)
tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+1/-1)
tests/qmltests/Dash/tst_Dash.qml (+17/-0)
tests/qmltests/Stages/tst_PhoneStage.qml (+6/-3)
To merge this branch: bzr merge lp://staging/~unity-team/unity8/rtm-20150113
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
Review via email: mp+246347@code.staging.launchpad.net
To post a comment you must log in.
1424. By Michał Sawicz

Revert r1419, it's not ready yet.

1425. By Michał Sawicz

Merge prerequisite

Revision history for this message
Michael Zanetti (mzanetti) wrote :

as per original merges

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: