diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
| commit | e227d2f84ce400ab515824281c99796aa84b502c (patch) | |
| tree | 1c34c638caa487c7c88c739bbf42925b860d3c4b | |
| parent | 4652a6457efe8d061c9dbd9fbf8c0758b374f2b6 (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | man/microtouch.man | 8 | ||||
| -rw-r--r-- | src/microtouch.c | 4 | ||||
| -rw-r--r-- | 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_ |