Merge lp://qastaging/~macslow/unity/unity.fix-841902-2 into lp://qastaging/unity

Proposed by Mirco Müller
Status: Merged
Approved by: Michal Hruby
Approved revision: no longer in the source branch.
Merged at revision: 1843
Proposed branch: lp://qastaging/~macslow/unity/unity.fix-841902-2
Merge into: lp://qastaging/unity
Diff against target: 92 lines (+20/-6)
4 files modified
UnityCore/Filter.cpp (+2/-0)
plugins/unityshell/src/FilterFactory.cpp (+7/-2)
plugins/unityshell/src/FilterGenreWidget.cpp (+10/-3)
plugins/unityshell/src/FilterGenreWidget.h (+1/-1)
To merge this branch: bzr merge lp://qastaging/~macslow/unity/unity.fix-841902-2
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Review via email: mp+89004@code.qastaging.launchpad.net

Description of the change

Fourth of fifth time I fix my stuff after the stuff in trunk changed below my feet after it was approved... having a fun wasting time :/

"The actual unity-part of the fix for LP: #841902. It needs lp:~macslow/libunity/libunity.fix-841902 and lp:~macslow/unity-lens-music/unity-lens-music.fix-841902 to be merged first."

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Let's hope it works this time, approved!

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.