Merge lp:~ubuntu-branches/ubuntu/natty/totem-pl-parser/natty-201012161914 into lp:ubuntu/natty/totem-pl-parser
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/totem-pl-parser/natty-201012161914 |
| Merge into: | lp:ubuntu/natty/totem-pl-parser |
| Diff against target: |
0 lines
Path conflict: <deleted> / debian/gir1.2-totem-plparser-1.0.install |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/totem-pl-parser/natty-201012161914 |
| 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/totem-pl-parser now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/totem-pl-parser/natty-201012161914. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 48. By Ken VanDine
-
releasing version 2.32.1-0ubuntu2
