Merge lp://qastaging/~ianchou821/ubuntu/utopic/unity/fix-lp1372130 into lp://qastaging/unity
Proposed by
Yu-Cheng Chou
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~ianchou821/ubuntu/utopic/unity/fix-lp1372130 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
108 lines (+43/-24) 2 files modified
debian/changelog (+6/-0) launcher/Launcher.cpp (+37/-24) |
| To merge this branch: | bzr merge lp://qastaging/~ianchou821/ubuntu/utopic/unity/fix-lp1372130 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stephen M. Webb (community) | Needs Fixing | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Marco Trevisan (Treviño) (3v1n0) wrote | # |
Revision history for this message
| Yu-Cheng Chou (ianchou821) wrote | # |
Unmerged revisions
- 3877. By Yu-Cheng Chou
-
Launcher: handle Trash icon under "steal drag" mode. (LP: #1372130)
- 3876. By Yu-Cheng Chou
-
Launcher: handle the switch between steal_drag and enter Trash.
(LP: #1372130) - 3875. By Yu-Cheng Chou
-
Launcher.cpp: just ignore Trash in "steal drag" mode. (LP: #1372130)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm sorry, this merge proposal does not appear on the usual bug-fix radar so got missed. I'm assuming it's because of the unusual path of the proposed branch in Launchpad (it's a diff against the Ubuntu package rather than the upstream project).
Please remove the debian/changelog changes and set the change message as a commit message to this merge proposal instead so that the Ubuntu autolander will handle it correctly.