diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:36:46 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:36:46 +0000 |
| commit | 36831fdc2a99af36f68204fd6e88ab7dd9e6e155 (patch) | |
| tree | 06e4207ce72e722b7202cd3ac36d8635b38388a3 | |
| parent | 0438da3e2a06bdd5259e484610932e73c2fec12e (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
| -rw-r--r-- | man/imstt.man | 8 | ||||
| -rw-r--r-- | src/imstt.h | 2 | ||||
| -rw-r--r-- | src/imstt_accel.c | 2 | ||||
| -rw-r--r-- | src/imstt_driver.c | 4 | ||||
| -rw-r--r-- | src/imstt_reg.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/man/imstt.man b/man/imstt.man index 377d117..22134b6 100644 --- a/man/imstt.man +++ b/man/imstt.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1 2001/01/24 00:06:20 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH IMSTT __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ imstt \- Integrated Micro Solutions Twin Turbo 128 driver .fi .SH DESCRIPTION .B imstt -is an XFree86 driver for Integrated Micro Solutions Twin Turbo 128 video chips. +is an __xservername__ driver for Integrated Micro Solutions Twin Turbo 128 video chips. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B imstt driver supports... .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .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/imstt.h b/src/imstt.h index b714aaf..624d416 100644 --- a/src/imstt.h +++ b/src/imstt.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5 2001/05/16 06:48:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4 2001/04/05 21:29:14 dawes Exp $ */ #ifndef _IMSTT_H #define _IMSTT_H diff --git a/src/imstt_accel.c b/src/imstt_accel.c index 86dca58..d52e03d 100644 --- a/src/imstt_accel.c +++ b/src/imstt_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6 2001/05/16 06:48:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5 2001/04/05 21:29:14 dawes Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> diff --git a/src/imstt_driver.c b/src/imstt_driver.c index be57c46..f25e3e0 100644 --- a/src/imstt_driver.c +++ b/src/imstt_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.21 2003/08/23 15:03:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.20 2002/09/24 15:23:55 tsi Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> @@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, diff --git a/src/imstt_reg.h b/src/imstt_reg.h index 92545b4..9870f49 100644 --- a/src/imstt_reg.h +++ b/src/imstt_reg.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.6 2004/02/19 22:38:14 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.5 2002/08/06 19:57:30 herrb Exp $ */ #ifndef _IMSTT_REG_H #define _IMSTT_REG_H |