Subject: CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware
To: None <source-changes@netbsd.org>
From: Matthias Scheler <tron@netbsd.org>
List: source-changes
Date: 03/01/2003 00:33:49
Module Name: xsrc
Committed By: tron
Date: Fri Feb 28 22:33:48 UTC 2003
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware: vmware.c
vmwarecurs.c
Log Message:
Fix merge errors.
To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c
cvs rdiff -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.