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: 0660506 dc4002d)

author	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 11:39:29 +0000 (12:39 +0100)
committer	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 11:39:29 +0000 (12:39 +0100)
commit	6ca714d55119e87a01bd475abd08e7212dcafbd0
tree	264c3a939b34f5daea19f45619686f060569f34d	tree \| snapshot
parent	0660506d1916f6538359f238e860804441ba24f3	commit \| diff
parent	dc4002d8c3c687e6614d01b34e4b6aa929411ea9	commit \| diff

* merged the apt-breaks-iwj branch
* pulled in the other remaining ubuntu changes

apt-pkg/acquire-item.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/acquire-item.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/algorithms.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/debsrcrecords.h	diff1 \|	diff2 \|	blob \| history
apt-pkg/depcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.cc	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcache.h	diff1 \|	diff2 \|	blob \| history
cmdline/apt-get.cc	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history

APT (for Cydia)