From 229911f0c4a66714afda1264f8eb9d6148975e91 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:51 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- man/void.man | 2 +- src/void.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/void.man b/man/void.man index 32b1189..04c2ae0 100644 --- a/man/void.man +++ b/man/void.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.2 2001/01/27 18:20:58 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.1 2001/01/24 00:06:38 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VOID __drivermansuffix__ __vendorversion__ diff --git a/src/void.c b/src/void.c index 15cc38b..21c91e0 100644 --- a/src/void.c +++ b/src/void.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.2 2000/08/11 19:10:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.1 1999/11/19 13:54:57 hohndel Exp $ */ /* Input device which doesn't output any event. This device can be used * as a core pointer or as a core keyboard. -- cgit v1.2.3