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: 6c0c038 1351329)

author	Michael Vogt <michael.vogt@ubuntu.com>
	Tue, 22 May 2012 14:07:49 +0000 (16:07 +0200)
committer	Michael Vogt <michael.vogt@ubuntu.com>
	Tue, 22 May 2012 14:07:49 +0000 (16:07 +0200)
commit	800694cbf33e206935dc9e6e8fa6e9a036b8efad
tree	1557d96ee0f463a020b11604146be66fb9809a31	tree \| snapshot
parent	6c0c0387e616f8d04f00916fbd1fe899acd265cd	commit \| diff
parent	1351329e376a8dbe7780693693d0f3db0ec749fa	commit \| diff

merged (and resolved a bunch of conflicts) of the debian-sid branch

19 files changed:

apt-pkg/deb/dpkgpm.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/depcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/init.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/packagemanager.cc	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
doc/apt-key.8.xml	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

APT (for Cydia)