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: e110d7b 55ef358)

author	Michael Vogt <mvo@debian.org>
	Thu, 29 May 2014 10:14:42 +0000 (12:14 +0200)
committer	Michael Vogt <mvo@debian.org>
	Thu, 29 May 2014 10:14:42 +0000 (12:14 +0200)
commit	1f46d14620a0b58a9239fa3faa59ba79a98f6c98
tree	fd096e59115c48d15f27b1ae7376caf5ce2929dc	tree \| snapshot
parent	e110d7bf5675f484c06b82f621ac98bedc464865	commit \| diff
parent	55ef358b06854768cea247870e1d2f28a5955b90	commit \| diff

Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental

Conflicts:
test/integration/test-bug-747261-arch-specific-conflicts

apt-pkg/deb/debindexfile.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/deblistparser.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/packagemanager.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/packagemanager.h	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)