Merge lp:~ubuntu-branches/ubuntu/oneiric/papyon/oneiric-201105131406 into lp:ubuntu/oneiric/papyon
Proposed by
James Westby
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp:~ubuntu-branches/ubuntu/oneiric/papyon/oneiric-201105131406 |
| Merge into: | lp:ubuntu/oneiric/papyon |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/oneiric/papyon/oneiric-201105131406 |
| 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/oneiric/papyon now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/papyon/oneiric-201105131406. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 31. By Omer Akram
-
* papyon/
msnp/notificati on.py:
- Papyon doesn't answer server's pings. (LP: #768974) - 30. By Michael Terry
-
* papyon/
msnp/notificati on.py:
- Papyon doesn't answer server's pings. (LP: #768974)
