Module Name:	xsrc
Committed By:	tron
Date:		Sat Jun  9 17:08:11 UTC 2001

Modified Files:
	xsrc/xfree/xc/config/cf: Imake.cf NetBSD.cf bsdLib.rules bsdLib.tmpl
	    sun.cf

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/config/cf/Imake.cf
cvs rdiff -r1.11 -r1.12 xsrc/xfree/xc/config/cf/NetBSD.cf
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/config/cf/bsdLib.rules \
    xsrc/xfree/xc/config/cf/bsdLib.tmpl xsrc/xfree/xc/config/cf/sun.cf

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