]> git.saurik.com Git - apt.git/commit - test/integration/test-apt-update-hashsum-mismatch
Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more...
authorMichael Vogt <mvo@ubuntu.com>
Thu, 6 Nov 2014 07:55:06 +0000 (08:55 +0100)
committerMichael Vogt <mvo@ubuntu.com>
Thu, 6 Nov 2014 07:55:06 +0000 (08:55 +0100)
commit9397ea947c23c0957a683152360909810340abce
tree6b29e35b9ef602c15d0aab20eefdec3138eb4692
parent87ecd6a2d719aeaeedd99dd500b467e966376f1c
parent6e2261d0f250406058d66b360080aa986953ae19
Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more-acquire-guessing

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
test/integration/test-apt-update-filesize-mismatch
test/integration/test-apt-update-hashsum-mismatch