diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-02-09 03:41:29 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-02-09 03:41:29 +0000 |
| commit | 030f53710cd396ee6e716cc4d5791537581814bb (patch) | |
| tree | 32af048e82e460540dbb9a29ce6d6dad7d76bb14 /test/uri.cc | |
| parent | 82b47aa557c4a137c6a7ed9bfc18bcc6124bf9f9 (diff) | |
| parent | ec048f63365407f01766ef218165280cee805f1a (diff) | |
Merge apt--mvo--0
Patches applied:
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-12
* star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-13
* commented the ftp no_proxy unseting in methods/ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-14
* starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-15
* merged with matt's tree
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-16
* added support for "Acquire::gpgv::options" in methods/gpgv.cc
* michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0
tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1
* slightly cosmetic change in methods/gpgv.cc
Diffstat (limited to 'test/uri.cc')
0 files changed, 0 insertions, 0 deletions