NetBSD master CVS tree commits

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

veego
Sun Mar  8 03:25:02 PST 1998
Update of /cvsroot/xsrc/xc/programs/Xserver
In directory nb00:/tmp/cvs-serv22309

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


veego
Sun Mar  8 03:25:49 PST 1998
Update of /cvsroot/xsrc/xc/programs/Xserver/dix
In directory nb00:/tmp/cvs-serv22329

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


veego
Sun Mar  8 03:26:31 PST 1998
Update of /cvsroot/xsrc/xc/programs/Xserver/include
In directory nb00:/tmp/cvs-serv22349

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


veego
Sun Mar  8 03:27:34 PST 1998
Update of /cvsroot/xsrc/xc/programs/xrdb
In directory nb00:/tmp/cvs-serv22369

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


veego
Sun Mar  8 03:28:23 PST 1998
Update of /cvsroot/xsrc/contrib/programs/xload
In directory nb00:/tmp/cvs-serv22395

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