Module Name:	src
Committed By:	lukem
Date:		Sat Jan 17 05:07:09 UTC 2004

Modified Files:
	src/distrib/sets: sets.subr
	src/distrib/sets/lists/xbase: mi
Removed Files:
	src/distrib/sets/lists/xcontrib: mi

Log Message:
Merge "xcontrib" into "xbase".
It was already merged in the XFree86 4.x source anyway, and it doesn't
make senses to keep some programs in a separate set just because they
used to be built from a separate directory in XFree86 3.x.


To generate a diff of this commit:
cvs rdiff -r1.25 -r1.26 src/distrib/sets/sets.subr
cvs rdiff -r1.31 -r1.32 src/distrib/sets/lists/xbase/mi
cvs rdiff -r1.5 -r0 src/distrib/sets/lists/xcontrib/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.