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: f6cb088 71ecaad)

author	Michael Vogt <michael.vogt@ubuntu.com>
	Thu, 10 Nov 2011 15:56:21 +0000 (16:56 +0100)
committer	Michael Vogt <michael.vogt@ubuntu.com>
	Thu, 10 Nov 2011 15:56:21 +0000 (16:56 +0100)
commit	7cb543fb742a837c4931513674febaec5e4c1401
tree	ddefe5b9329907818aa6eb3b593f555b29ccb869	tree \| snapshot
parent	f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb	commit \| diff
parent	71ecaad29d8066a494f516efc5efd80860653fe2	commit \| diff

merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts

18 files changed:

apt-pkg/deb/dpkgpm.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/depcache.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-key	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
doc/po/apt-doc.pot	diff1 \|	diff2 \|	blob \| history
doc/po/de.po	diff1 \|	diff2 \|	blob \| history
doc/po/es.po	diff1 \|	diff2 \|	blob \| history
doc/po/fr.po	diff1 \|	diff2 \|	blob \| history
doc/po/it.po	diff1 \|	diff2 \|	blob \| history
doc/po/ja.po	diff1 \|	diff2 \|	blob \| history
doc/po/pl.po	diff1 \|	diff2 \|	blob \| history
doc/po/pt.po	diff1 \|	diff2 \|	blob \| history
doc/po/pt_BR.po	diff1 \|	diff2 \|	blob \| history
po/apt-all.pot	diff1 \|	diff2 \|	blob \| history
test/integration/test-bug-618288-multiarch-same-lockstep	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)