Merge lp:~ubuntu-branches/ubuntu/lucid/dictionaries-common/lucid-201002122359 into lp:ubuntu/lucid/dictionaries-common
Proposed by
James Westby
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/dictionaries-common/lucid-201002122359 |
| Merge into: | lp:ubuntu/lucid/dictionaries-common |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/dictionaries-common/lucid-201002122359 |
| Related bugs: |
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) wrote | # |
Unmerged revisions
- 24. By Mathias Gug
-
Makefile.in, debian/control: use w3m instead of elinks to build the
documentation.
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/dictionaries-common now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/dictionaries-common/lucid-201002122359. A merge should be performed if necessary.