Subject: CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident
To: None <source-changes@netbsd.org>
From: Matthias Scheler <tron@netbsd.org>
List: source-changes
Date: 03/01/2003 00:37:03
Module Name:	xsrc
Committed By:	tron
Date:		Fri Feb 28 22:37:03 UTC 2003

Modified Files:
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident:
	    trident_driver.c

Log Message:
Fix merge error.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c

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