summaryrefslogtreecommitdiff
path: root/test/integration/test-dpkg-assert-multi-arch
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-23 15:47:44 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-23 15:47:44 +0200
commitdb1d1c32149177c0b6ca49e5107ab1f5fd364660 (patch)
treeb06b22a9c92455b32889c88407f4190113a5cdd9 /test/integration/test-dpkg-assert-multi-arch
parent916b89109cd77728004819d4705778e3dc489b2e (diff)
parentc511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (diff)
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts: apt-pkg/acquire-item.cc apt-pkg/acquire-item.h methods/copy.cc test/integration/test-hashsum-verification
Diffstat (limited to 'test/integration/test-dpkg-assert-multi-arch')
0 files changed, 0 insertions, 0 deletions