diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:49:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:49:23 +0000 |
commit | ec3d2a021a091ab7ea3a33f169aca1a1d10423b8 (patch) | |
tree | 733c7507aab2273d11716d7b53fc94f1b53360a9 | |
parent | 41ba5536d67b07a98e346cf5c23530cc3828cb1b (diff) |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-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/suntcx.man | 8 | ||||
-rw-r--r-- | src/tcx.h | 2 | ||||
-rw-r--r-- | src/tcx_cursor.c | 2 | ||||
-rw-r--r-- | src/tcx_driver.c | 4 | ||||
-rw-r--r-- | src/tcx_regs.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/man/suntcx.man b/man/suntcx.man index 06bf55c..fd0f7dd 100644 --- a/man/suntcx.man +++ b/man/suntcx.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.1 2001/01/24 00:06:31 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNTCX __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ suntcx \- TCX video driver .fi .SH DESCRIPTION .B suntcx -is an XFree86 driver for Sun TCX video cards. +is an __xservername__ driver for Sun TCX video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B suntcx 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: Jakub Jelinek <jakub@redhat.com> @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.2 2001/05/04 19:05:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.1 2000/06/30 17:15:16 dawes Exp $ */ #ifndef TCX_H #define TCX_H diff --git a/src/tcx_cursor.c b/src/tcx_cursor.c index 61ec1d6..e49b70d 100644 --- a/src/tcx_cursor.c +++ b/src/tcx_cursor.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_cursor.c,v 1.1 2000/06/30 17:15:16 dawes Exp $ */ +/* $XFree86:$ */ #include "tcx.h" diff --git a/src/tcx_driver.c b/src/tcx_driver.c index bca4a7a..86d1f38 100644 --- a/src/tcx_driver.c +++ b/src/tcx_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c,v 1.7 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c,v 1.6 2001/08/07 07:04:51 keithp Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -104,7 +104,7 @@ static XF86ModuleVersionInfo suntcxVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TCX_MAJOR_VERSION, TCX_MINOR_VERSION, TCX_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, diff --git a/src/tcx_regs.h b/src/tcx_regs.h index 61e4b0a..9b9c00d 100644 --- a/src/tcx_regs.h +++ b/src/tcx_regs.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_regs.h,v 1.1 2000/06/30 17:15:17 dawes Exp $ */ +/* $XFree86:$ */ #ifndef TCX_REGS_H #define TCX_REGS_H |