]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/jessie' into debian/experimental
authorDavid Kalnischkies <david@kalnischkies.de>
Sat, 18 Apr 2015 23:24:46 +0000 (01:24 +0200)
committerDavid Kalnischkies <david@kalnischkies.de>
Sat, 18 Apr 2015 23:27:31 +0000 (01:27 +0200)
commit05f64ca2e483709faa6bc69dfa79129d2d4c679e
treeb0937914182c227b6e662f3820b0e58f86f6c617
parentf4c7a238f4c29ac9b1e1172f103ab7dec5c5807d
parentae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4
Merge branch 'debian/jessie' into debian/experimental

Conflicts:
apt-pkg/acquire-item.cc
cmdline/apt-key.in
methods/https.cc
test/integration/test-apt-key
test/integration/test-multiarch-foreign
apt-pkg/contrib/strutl.h
apt-pkg/deb/deblistparser.cc
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
configure.ac
debian/changelog
test/integration/test-apt-key
test/integration/test-multiarch-foreign
test/integration/test-specific-architecture-dependencies