git.saurik.com Git - apt.git/commit

]> git.saurik.com Git - apt.git/commit

author	Michael Vogt <mvo@debian.org>
	Wed, 18 Jun 2014 08:13:01 +0000 (10:13 +0200)
committer	Michael Vogt <mvo@debian.org>
	Wed, 18 Jun 2014 08:13:01 +0000 (10:13 +0200)
commit	da029b0aaebdc64a3a9f6b7012213539421c934b
tree	81ea34b4e10c9428c375fa3aaa21b831d69fcfe2	tree \| snapshot
parent	aa0bd601ea3db281187275bbbece760d85ff29d9	commit \| diff
parent	637c3b232223c17827a8842cb1c24655469329ba	commit \| 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

apt-pkg/pkgcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcachegen.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-cache.cc	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)

RSS Atom

apt-pkg/pkgcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcachegen.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-cache.cc	diff1 \|	diff2 \|	blob \| history