summaryrefslogtreecommitdiff
path: root/apt-pkg/vendorlist.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-04-28 17:25:28 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-04-28 17:25:28 +0200
commit8e0002ac420707b94a8a43dfedea7fc182dd5851 (patch)
treeee125ad1dd03f56436fb733f13d4c36c1e3d2fa8 /apt-pkg/vendorlist.cc
parenta9d990a2602fca4f217705e356b449b0f42a7760 (diff)
parent53ac87ac9c27af39df062516aab5dce880af107a (diff)
Merge branch 'feature/abspath' into feature/apt-install-deb
Conflicts: test/libapt/fileutl_test.cc
Diffstat (limited to 'apt-pkg/vendorlist.cc')
0 files changed, 0 insertions, 0 deletions