git.saurik.com Git - apt.git/commit - debian/apt.install.in

]> git.saurik.com Git - apt.git/commit - debian/apt.install.in

projects / apt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a5e7909 fc104da)

author	Michael Vogt <mvo@debian.org>
	Thu, 27 Feb 2014 21:52:34 +0000 (22:52 +0100)
committer	Michael Vogt <mvo@debian.org>
	Thu, 27 Feb 2014 21:52:34 +0000 (22:52 +0100)
commit	fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a
tree	be7d18baa836e9df166ec63f6c9fe6f94bb84b40	tree \| snapshot
parent	a5e790985752c6820e08e7a7e650e1607fa826e4	commit \| diff
parent	fc104da6a583736223b2f941e43a05ea26b63a7d	commit \| diff

Merge branch 'debian/sid' into debian/experimental

Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog

13 files changed:

apt-pkg/acquire-item.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/contrib/fileutl.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/contrib/fileutl.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/dpkgpm.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.h	diff1 \|	diff2 \|	blob \| history
apt-private/private-list.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history
debian/apt.install.in	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/libapt-pkg4.13.symbols	diff1 \|	\|	blob \| history
test/interactive-helper/makefile	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)