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

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

projects / apt.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8598854 70e0c16)

author	Michael Vogt <mvo@debian.org>
	Thu, 22 Aug 2013 20:24:27 +0000 (22:24 +0200)
committer	Michael Vogt <mvo@debian.org>
	Thu, 22 Aug 2013 20:24:27 +0000 (22:24 +0200)
commit	fbe0969131dc2472bcefbceaf390015ba68e1327
tree	8a559e599f2284f97e93ffbea3db24c24c567b6a	tree \| snapshot
parent	85988543cb4692571a754818a56cd0fd1c27d5a9	commit \| diff
parent	70e0c1683e7021a0682b0808b329a3cced3920ac	commit \| diff

Merge remote-tracking branch 'mvo/bugfix/coverity' into debian/sid

Conflicts:
apt-pkg/tagfile.h

apt-pkg/acquire-item.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/contrib/cmndline.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/contrib/strutl.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/tagfile.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/tagfile.h	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)