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

---
 man/microtouch.man | 8 ++++----
 src/microtouch.c   | 4 ++--
 src/microtouch.h   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/man/microtouch.man b/man/microtouch.man
index af1a467..61c869e 100644
--- a/man/microtouch.man
+++ b/man/microtouch.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man,v 1.2 2001/01/27 18:20:58 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man,v 1.1 2001/01/24 00:06:36 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH MICROTOUCH __drivermansuffix__ __vendorversion__
@@ -15,7 +15,7 @@ microtouch \- MicroTouch input driver
 .fi
 .SH DESCRIPTION
 .B microtouch 
-is an XFree86 input driver for MicroTouch devices...
+is an __xservername__ input driver for MicroTouch devices...
 .PP
 The
 .B microtouch
@@ -25,12 +25,12 @@ THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 What is supported...
 .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
 section only covers configuration details specific to this driver.
 .PP
 Config details...
 .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/microtouch.c b/src/microtouch.c
index e17ca99..665bfd1 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -48,7 +48,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.c,v 1.12 2000/08/11 19:10:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.c,v 1.11 1999/08/28 10:43:36 dawes Exp $ */
 
 #define _microtouch_C_
 /*****************************************************************************
@@ -99,7 +99,7 @@ static XF86ModuleVersionInfo VersionRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,
diff --git a/src/microtouch.h b/src/microtouch.h
index 696b12e..5542859 100644
--- a/src/microtouch.h
+++ b/src/microtouch.h
@@ -24,7 +24,7 @@
  * in this Software without prior written authorization from Metro Link.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.h,v 1.4 2000/03/03 20:36:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.h,v 1.3 1999/08/28 09:01:17 dawes Exp $ */
 
 #ifndef	_microtouch_H_
 #define _microtouch_H_
-- 
cgit v1.2.3