Public Git Hosting - gentoo-diskmaster-overlay.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 948e2c5 09d0dfe)

commit	2c883ec6db0926ca545608e388ca138012014368
author	Diskmaster <disk@neb.rr.com>
	Fri, 1 Aug 2008 07:45:14 +0000 (1 02:45 -0500)
committer	Diskmaster <disk@neb.rr.com>
	Fri, 1 Aug 2008 07:45:14 +0000 (1 02:45 -0500)
tree	76b3e28be87fa4f4117f88e64ca78737e5ecdbff	tree \| snapshot (tar.gz zip)
parent	948e2c55711756b4cb06e1f47ece59a8d5f8c532	commit \| diff
parent	09d0dfee8849e38ace8ee6c33f8ae467234cc20e	commit \| diff

Merge branch 'master' of git://zen-sources.org/zen/portage-overlay

Conflicts:

sys-fs/e2fsprogs/Manifest
sys-libs/com_err/Manifest
sys-libs/ss/Manifest

sys-fs/e2fsprogs/Manifest	diff1 \|	diff2 \|	blob \| history
sys-libs/com_err/Manifest	diff1 \|	diff2 \|	blob \| history
sys-libs/ss/Manifest	diff1 \|	diff2 \|	blob \| history

Diskmaster's overlay for gentoo.