diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:47:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:47:13 +0000 |
| commit | 71922f77be69323dcb937e8c8e00249d187f581f (patch) | |
| tree | 931a3ff539d370bc41de1dbadcbfd332b76f3db2 | |
| parent | 2280cf405f5cc5a7650ec8e36fcc4afaf01d2830 (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/suncg3.man | 8 | ||||
| -rw-r--r-- | src/cg3.h | 2 | ||||
| -rw-r--r-- | src/cg3_driver.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/man/suncg3.man b/man/suncg3.man index 8c1c8f1..5182c80 100644 --- a/man/suncg3.man +++ b/man/suncg3.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG3 __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ suncg3 \- CG3 video driver .fi .SH DESCRIPTION .B suncg3 -is an XFree86 driver for Sun CG3 video cards. +is an __xservername__ driver for Sun CG3 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B suncg3 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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */ +/* $XFree86:$ */ #ifndef CG3_H #define CG3_H diff --git a/src/cg3_driver.c b/src/cg3_driver.c index dd5ef49..60f61bf 100644 --- a/src/cg3_driver.c +++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */ #define PSZ 8 #include "xf86.h" @@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |