summaryrefslogtreecommitdiff
path: root/test/integration/Packages-policy-pinning
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-24 23:07:10 +0100
committerMichael Vogt <mvo@debian.org>2014-01-24 23:07:10 +0100
commit3cfc6336251057cdebe5261addfe61bd89311335 (patch)
tree13e37426176bd1645ca035aa14cc4e463e73d56f /test/integration/Packages-policy-pinning
parent48e48cbdc47a0b29ac1b9d2b7d4eef61be73d06d (diff)
parent17622532ce19a1bcebfebdfc9ec20a7e3df9dbff (diff)
Merge remote-tracking branch 'mvo/feature/apt-show-nice' into debian/experimental-no-abi-break
Conflicts: apt-private/private-cmndline.cc
Diffstat (limited to 'test/integration/Packages-policy-pinning')
0 files changed, 0 insertions, 0 deletions