diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 17:01:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 17:01:03 +0200 |
| commit | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (patch) | |
| tree | f952bb728b9c23f1eebc8f1a87f527ed7c9b0b36 /vendor/ubuntu | |
| parent | 6bf93605fdb8e858d3f0a79a124c1d39f760094d (diff) | |
| parent | 65759e00eff0513c34f584b99420b72fe0e5073e (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/pkgcache.h
debian/changelog
methods/https.cc
methods/server.cc
test/integration/test-apt-download-progress
Diffstat (limited to 'vendor/ubuntu')
0 files changed, 0 insertions, 0 deletions