From 118fbed4fb91e931b679d2103892d504a6f30353 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:05 +0000
Subject: Merging XORG-CURRENT into trunk

---
 man/void.man | 8 ++++----
 src/void.c   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/void.man b/man/void.man
index 32b1189..39b7e9f 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__
@@ -14,16 +14,16 @@ void \- null input driver
 .fi
 .SH DESCRIPTION
 .B void 
-is an dummy/null XFree86 input driver.  It doesn't connect to any
+is an dummy/null __xservername__ input driver.  It doesn't connect to any
 physical device, and it never delivers any events.  It functions as
 both a pointer and keyboard device, and may be used as X server's core
 pointer and/or core keyboard.  It's purpose is to allow the X server
 to operate without a core pointer and/or core keyboard.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details and for options that can be used with all input drivers.  This
 driver doesn't have any configuration options in addition to those.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
diff --git a/src/void.c b/src/void.c
index 15cc38b..02a0f71 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.
@@ -264,7 +264,7 @@ static XF86ModuleVersionInfo xf86VoidVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
-- 
cgit v1.2.3