Merge lp://staging/~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2 into lp://staging/ubuntu/natty/gnome-system-tools
Proposed by
Milan Bouchet-Valat
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2 |
| Merge into: | lp://staging/ubuntu/natty/gnome-system-tools |
| Diff against target: |
37 lines (+11/-1) (has conflicts) 2 files modified
debian/changelog (+10/-0) src/users/privileges-table.c (+1/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools.fix-433654-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Coulson | Pending | ||
|
Review via email:
|
|||
Description of the change
Should be committed now, you (Chris) only delayed it because of the String Freeze last cycle. See bug #433654.
To post a comment you must log in.
Unmerged revisions
- 109. By Milan Bouchet-Valat
-
Fix description of 'audio' group to make it clear people
don't likely want to use it (LP: #433654).
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
