]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 15:01:03 +0000 (17:01 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 15:01:03 +0000 (17:01 +0200)
commit4fc6b7570c3e97b65c118b58cdf6729fa94c9b03
treef952bb728b9c23f1eebc8f1a87f527ed7c9b0b36
parent6bf93605fdb8e858d3f0a79a124c1d39f760094d
parent65759e00eff0513c34f584b99420b72fe0e5073e
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
apt-pkg/contrib/fileutl.cc
apt-pkg/pkgcache.cc
debian/changelog
methods/http.cc
methods/https.cc
methods/server.cc
methods/server.h
test/integration/test-apt-download-progress
test/integration/test-bug-lp1445239-download-loop
test/interactive-helper/aptwebserver.cc