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

Modified Files:
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati: atilock.c

Log Message:
Fix merge error.

To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 \

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