diff options
| author | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
| commit | 32120cde98308448fbcd31cf7841f13a86d3e0a8 (patch) | |
| tree | 102ec9f093480109c14d7f0450bc4a584d42a4c0 /apt-pkg/acquire-item.h | |
| parent | c1409d1be88557529c62883be3174793481233de (diff) | |
| parent | 9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file
Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect
Diffstat (limited to 'apt-pkg/acquire-item.h')
0 files changed, 0 insertions, 0 deletions