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

]> git.saurik.com Git - apt.git/commit - cmdline/apt-key.in

author	David Kalnischkies <david@kalnischkies.de>
	Sat, 18 Apr 2015 23:24:46 +0000 (01:24 +0200)
committer	David Kalnischkies <david@kalnischkies.de>
	Sat, 18 Apr 2015 23:27:31 +0000 (01:27 +0200)
commit	05f64ca2e483709faa6bc69dfa79129d2d4c679e
tree	b0937914182c227b6e662f3820b0e58f86f6c617	tree \| snapshot
parent	f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d	commit \| diff
parent	ae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4	commit \| diff

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 (for Cydia)

RSS Atom

apt-pkg/contrib/strutl.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/deblistparser.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/dpkgpm.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-key.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
test/integration/test-apt-key	diff1 \|	diff2 \|	blob \| history
test/integration/test-multiarch-foreign	diff1 \|	diff2 \|	blob \| history
test/integration/test-specific-architecture-dependencies	diff1 \|	diff2 \|	blob \| history