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

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

projects / apt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 80624be 6074bc9)

author	Michael Vogt <mvo@debian.org>
	Wed, 18 Jun 2014 06:32:47 +0000 (08:32 +0200)
committer	Michael Vogt <mvo@debian.org>
	Wed, 18 Jun 2014 06:32:47 +0000 (08:32 +0200)
commit	aa0bd601ea3db281187275bbbece760d85ff29d9
tree	c84bebb3966255cdae36562024592c6b4eb6a2f2	tree \| snapshot
parent	80624be7c54aec6ed98ee254366155024fca1a71	commit \| diff
parent	6074bc9ba4ecdd08674a828bdb46323b5d8bf957	commit \| diff

Merge branch 'debian/sid' into debian/experimental

Conflicts:
debian/changelog

12 files changed:

apt-pkg/contrib/fileutl.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/debsrcrecords.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/dpkgpm.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/srcrecords.h	diff1 \|	diff2 \|	blob \| history
apt-private/private-install.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/libapt-pkg4.13.symbols	diff1 \|	\|	blob \| history
ftparchive/cachedb.cc	diff1 \|	diff2 \|	blob \| history
ftparchive/cachedb.h	diff1 \|	diff2 \|	blob \| history
ftparchive/writer.h	diff1 \|	diff2 \|	blob \| history
test/integration/framework	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)