NetBSD master CVS tree commits

[The Source of All Evil <source%NetBSD.ORG@localhost>]

veego
Sun Mar  8 03:56:55 PST 1998
Update of /cvsroot/xsrc/xc/programs/xkbcomp
In directory nb00:/tmp/cvs-serv22952

Modified Files:
        Imakefile 
Log Message:
Resolve conflicts from the import of XFree86 3.3.2.


veego
Sun Mar  8 03:58:41 PST 1998
Update of /cvsroot/xsrc/xc/programs/Xserver/os
In directory nb00:/tmp/cvs-serv22990

Modified Files:
        utils.c 
Log Message:
Resolve conflicts from the import of XFree86 3.3.2.