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

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

projects / apt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b4017ba 4b9969d)

author	Michael Vogt <mvo@debian.org>
	Tue, 22 Oct 2013 20:05:15 +0000 (22:05 +0200)
committer	Michael Vogt <mvo@debian.org>
	Tue, 22 Oct 2013 20:06:24 +0000 (22:06 +0200)
commit	51355387e5a5d4d7275a34b1c22f0ef5a76172d5
tree	e40c80a0d5268eb42cf71461e5ef9494658e1b7d	tree \| snapshot
parent	b4017ba767e15dc06c73915efaf36409ee099bf2	commit \| diff
parent	4b9969da40ff1dff2f5787feff5103c873c57f7f	commit \| diff

Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor

Conflicts:
apt-pkg/deb/dpkgpm.cc
apt-pkg/makefile

apt-pkg/makefile

APT (for Cydia)