diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:21 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:21 +0000 |
| commit | aeaf94901de70fb19584da03bfabef4a9283e5ea (patch) | |
| tree | 131156f8ac34db5c1c01087bc257e58008981551 | |
| parent | acdbceaa67fccd66cbca67343d336c4c5657f855 (diff) | |
Merged changes from RELEASE-1 branch
| -rw-r--r-- | man/glint.man | 6 | ||||
| -rw-r--r-- | src/glint_driver.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/glint.man b/man/glint.man index c3c1da7..e24663f 100644 --- a/man/glint.man +++ b/man/glint.man @@ -14,7 +14,7 @@ glint \- GLINT/Permedia video driver .fi .SH DESCRIPTION .B glint -is an XFree86 driver for 3Dlabs & Texas Instruments GLINT/Permedia based video +is an __xservername__ driver for 3Dlabs & Texas Instruments GLINT/Permedia based video cards. The driver is rather fully accelerated, and provides support for the following framebuffer depths: 8, 15 (may give bad results with FBDev support), 16, 24 (32 bpp recommended, 24 bpp has problems), 30, and an 8+24 overlay mode. @@ -25,7 +25,7 @@ driver supports 3Dlabs (GLINT MX, GLINT 500TX, GLINT 300SX, GLINT GAMMA, GLINT DELTA, GLINT GAMMA2, Permedia, Permedia 2, Permedia 2v, Permedia 3, R3, R4) and Texas Instruments (Permedia, Permedia 2) chips. .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. .PP @@ -104,7 +104,7 @@ acceleration in general, but disables it for some special cases. Default: off. If you have a card of the same name, turn this on. Default: off. .TP .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: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer, Sven Luther diff --git a/src/glint_driver.c b/src/glint_driver.c index da3c6f2..2106d48 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -386,7 +386,7 @@ static XF86ModuleVersionInfo glintVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, GLINT_MAJOR_VERSION, GLINT_MINOR_VERSION, GLINT_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, |