Merge lp://staging/~evfool/software-center/lp927426 into lp://staging/software-center
Proposed by
Robert Roth
| Status: | Merged |
|---|---|
| Merged at revision: | 3012 |
| Proposed branch: | lp://staging/~evfool/software-center/lp927426 |
| Merge into: | lp://staging/software-center |
| Diff against target: |
242 lines (+75/-15) (has conflicts) 8 files modified
data/ui/gtk3/dialogs.ui (+1/-1) debian/changelog (+25/-2) softwarecenter/db/categories.py (+1/-1) softwarecenter/ui/gtk3/app.py (+11/-4) softwarecenter/ui/gtk3/models/appstore2.py (+10/-2) softwarecenter/ui/gtk3/widgets/buttons.py (+1/-0) softwarecenter/ui/gtk3/widgets/reviews.py (+12/-4) test/gtk3/test_appstore2.py (+14/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~evfool/software-center/lp927426 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| software-store-developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Changed the reference to store to Software Center, as requested in bug #927426. The merge proposal is for quantal, as it breaks the strings, so it might not be appropriate for precise.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
