CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86

[Matthias Scheler <tron%netbsd.org@localhost>]

Module Name:    xsrc
Committed By:   tron
Date:           Sat Mar  1 07:54:38 UTC 2003

Modified Files:
        xsrc/xfree/xc/programs/Xserver/hw/xfree86: xf86Version.h

Log Message:
Resolve conflicts from import of XFree86 4.3.0.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86Version.h

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