Merge lp://staging/~ubuntu-branches/ubuntu/natty/system-config-printer/natty-201103250200 into lp://staging/ubuntu/natty/system-config-printer
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/system-config-printer/natty-201103250200 |
| Merge into: | lp://staging/ubuntu/natty/system-config-printer |
| Diff against target: |
84 lines (+65/-0) (has conflicts) 2 files modified
debian/changelog (+13/-0) debian/patches/10_menu_entries.patch.OTHER (+52/-0) Text conflict in debian/changelog Contents conflict in debian/patches/10_menu_entries.patch |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/system-config-printer/natty-201103250200 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/system-config-printer now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/system-config-printer/natty-201103250200. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 155. By Till Kamppeter
-
debian/
patches/ 10_menu_ entries. patch: updated to hide "Manage Print Jobs"
from "Accessories" menu. There is a "View Print Queue" menu entry in
System > Administration > Printing to show all print jobs of a printer and
the users print jobs can be viewed by clicking the tray icon that appears
after printing something (LP: #204732).
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
