diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-07-28 18:52:39 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-07-28 18:52:39 +0000 |
| commit | be9b936074e8dc8fb82f36dee9029594a5f82532 (patch) | |
| tree | d465d3e7b00226453c2f659e1e5d7867b9b5299e /ftparchive/apt-ftparchive.cc | |
| parent | bab3080e7efc218a53118609ddf6bde14899b497 (diff) | |
Merge with Matt
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-97
Update priority of apt-utils to important, to match the override file
* apt@packages.debian.org/apt--main--0--patch-98
Install only one keyring on each branch (Closes: #316119)
* apt@packages.debian.org/apt--main--0--patch-99
Finalize 0.6.39
* apt@packages.debian.org/apt--main--0--patch-100
Use debian.org address in mainline
* apt@packages.debian.org/apt--main--0--patch-101
Update pot file
* apt@packages.debian.org/apt--main--0--patch-102
Open 0.6.40
* apt@packages.debian.org/apt--main--0--patch-103
Patch from Jordi Mallach to mark some additional strings for translation
* apt@packages.debian.org/apt--main--0--patch-104
Updated Catalan translation from Jordi Mallach
Diffstat (limited to 'ftparchive/apt-ftparchive.cc')
0 files changed, 0 insertions, 0 deletions