]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Thu, 27 Feb 2014 21:52:34 +0000 (22:52 +0100)
committerMichael Vogt <mvo@debian.org>
Thu, 27 Feb 2014 21:52:34 +0000 (22:52 +0100)
commitfce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a
treebe7d18baa836e9df166ec63f6c9fe6f94bb84b40
parenta5e790985752c6820e08e7a7e650e1607fa826e4
parentfc104da6a583736223b2f941e43a05ea26b63a7d
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
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h
apt-pkg/deb/dpkgpm.cc
apt-pkg/pkgcache.cc
apt-pkg/pkgcache.h
apt-private/private-list.cc
cmdline/apt-get.cc
debian/apt.install.in
debian/changelog
debian/control
debian/libapt-pkg4.13.symbols
test/interactive-helper/makefile