Unity

Merge lp://qastaging/~yeganeh/unity/fix-for-838901 into lp://qastaging/unity

  1. fix-for-838901
  2. Merge into trunk
Proposed by Zaid Yeganeh
Status: Rejected
Rejected by: Andrea Azzarone
Proposed branch: lp://qastaging/~yeganeh/unity/fix-for-838901
Merge into: lp://qastaging/unity
Diff against target: 85 lines (+3/-13)
2 files modified
plugins/unityshell/src/FilterBasicButton.cpp (+3/-12)
plugins/unityshell/src/FilterBasicButton.h (+0/-1)
To merge this branch: bzr merge lp://qastaging/~yeganeh/unity/fix-for-838901
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Disapprove
Neil J. Patel (community) Approve
Review via email: mp+78508@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good, approved (for trunk only, though, as it can't be SRU'd for Oneiric now)

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/FilterBasicButton.cpp

Revision history for this message
Andrea Azzarone (azzar1) wrote :

@Zaid Can you fix the conflicts please?

Revision history for this message
Andrea Azzarone (azzar1) wrote :

We can use json file to disable preview state.

review: Disapprove

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.