summaryrefslogtreecommitdiff
path: root/methods/file.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-18 10:13:01 +0200
committerMichael Vogt <mvo@debian.org>2014-06-18 10:13:01 +0200
commitda029b0aaebdc64a3a9f6b7012213539421c934b (patch)
tree81ea34b4e10c9428c375fa3aaa21b831d69fcfe2 /methods/file.cc
parentaa0bd601ea3db281187275bbbece760d85ff29d9 (diff)
parent637c3b232223c17827a8842cb1c24655469329ba (diff)
Merge remote-tracking branch 'mvo/feature/hash-stats' into debian/experimental
Conflicts: apt-pkg/acquire-item.cc apt-pkg/acquire-item.h apt-pkg/deb/debmetaindex.h apt-pkg/pkgcache.cc test/integration/test-apt-ftparchive-src-cachedb
Diffstat (limited to 'methods/file.cc')
0 files changed, 0 insertions, 0 deletions