diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-24 23:07:10 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-24 23:07:10 +0100 |
| commit | 3cfc6336251057cdebe5261addfe61bd89311335 (patch) | |
| tree | 13e37426176bd1645ca035aa14cc4e463e73d56f /apt-pkg/acquire-method.cc | |
| parent | 48e48cbdc47a0b29ac1b9d2b7d4eef61be73d06d (diff) | |
| parent | 17622532ce19a1bcebfebdfc9ec20a7e3df9dbff (diff) | |
Merge remote-tracking branch 'mvo/feature/apt-show-nice' into debian/experimental-no-abi-break
Conflicts:
apt-private/private-cmndline.cc
Diffstat (limited to 'apt-pkg/acquire-method.cc')
0 files changed, 0 insertions, 0 deletions