Merge lp://qastaging/~fboucault/unity-2d/blueish_images into lp://qastaging/unity-2d/3.0

Proposed by Florian Boucault
Status: Superseded
Proposed branch: lp://qastaging/~fboucault/unity-2d/blueish_images
Merge into: lp://qastaging/unity-2d/3.0
Diff against target: 57 lines (+9/-9)
3 files modified
launcher/LauncherItem.qml (+2/-2)
places/app/places.cpp (+3/-3)
spread/app/spread.cpp (+4/-4)
To merge this branch: bzr merge lp://qastaging/~fboucault/unity-2d/blueish_images
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) code functional Approve
unity-2d-team Pending
Review via email: mp+46564@code.qastaging.launchpad.net
To post a comment you must log in.
369. By Florian Boucault

Synchronised comment in places.cpp with spread.cpp.

Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Minor changes and work as expected.

The packaging bits from this branch is broken, but after fixing and testing on Efika I'm no longer getting blueish pixmaps when using spread.

review: Approve (code functional)
Revision history for this message
Florian Boucault (fboucault) wrote :

@Ricardo, what do you mean by "packaging bits from this branch is broken"?
It is very important that packaging keeps working.

Revision history for this message
Florian Boucault (fboucault) wrote :

@Ricardo, this is the wrong merge request, please see https://code.launchpad.net/~fboucault/unity-2d/blueish_images/+merge/46565

Unmerged revisions

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