diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
| commit | c2a5716bcb661c36fb9c2adf687e2f45cc321f24 (patch) | |
| tree | 847a93154b0a665fe32984e98548b04df53c457f | |
| parent | 649bc72b3b73fefa54a9dc5869c798b3d7e861e9 (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/calcomp.man | 8 | ||||
| -rw-r--r-- | src/xf86Calcomp.c | 4 | ||||
| -rw-r--r-- | src/xf86Calcomp.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/man/calcomp.man b/man/calcomp.man index 2b025c0..d059411 100644 --- a/man/calcomp.man +++ b/man/calcomp.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/calcomp.man,v 1.2 2001/08/12 22:51:29 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v 1.2 2001/01/27 18:20:59 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH CALCOMP __drivermansuffix__ __vendorversion__ @@ -15,7 +15,7 @@ calcomp \- Calcomp input driver .fi .SH DESCRIPTION .B calcomp -is an XFree86 input driver for Calcomp devices. +is an __xservername__ input driver for Calcomp devices. .PP The .B calcomp @@ -25,7 +25,7 @@ X server's core pointer. This driver supports the Calcomp binary format used by the Drawing Board II and III series. .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 @@ -77,6 +77,6 @@ sets the level of debugging info reported. .TP 4 .RE .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 Martin Kroeker <mk@daveg.com> diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c index accbfe3..5f24365 100644 --- a/src/xf86Calcomp.c +++ b/src/xf86Calcomp.c @@ -31,7 +31,7 @@ * authorization from Martin Kroeker or Daveg GmbH. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.c,v 1.8 2003/01/15 03:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.c,v 1.7 2003/01/12 03:55:50 tsi Exp $ */ #define _CALCOMP_C_ /***************************************************************************** @@ -95,7 +95,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/xf86Calcomp.h b/src/xf86Calcomp.h index a3787fc..fc22747 100644 --- a/src/xf86Calcomp.h +++ b/src/xf86Calcomp.h @@ -26,7 +26,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.h,v 1.2 2001/10/28 03:33:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.h,v 1.1 2001/08/12 22:48:43 alanh Exp $ */ #ifndef _CALCOMP_H_ #define _CALCOMP_H_ |