Module Name: xsrc Committed By: veego Date: Thu Nov 26 20:58:01 UTC 1998 Modified Files: xsrc/xc/config/cf: xf86site.def Log Message: Another round of conflict fixes and protect the Xserver defines with some ifdefs.