summaryrefslogtreecommitdiff
path: root/ftparchive/contents.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-04-19 01:24:46 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-04-19 01:27:31 +0200
commit05f64ca2e483709faa6bc69dfa79129d2d4c679e (patch)
treeb0937914182c227b6e662f3820b0e58f86f6c617 /ftparchive/contents.h
parentf4c7a238f4c29ac9b1e1172f103ab7dec5c5807d (diff)
parentae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4 (diff)
Merge branch 'debian/jessie' into debian/experimental
Conflicts: apt-pkg/acquire-item.cc cmdline/apt-key.in methods/https.cc test/integration/test-apt-key test/integration/test-multiarch-foreign
Diffstat (limited to 'ftparchive/contents.h')
0 files changed, 0 insertions, 0 deletions