[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/fbdevhw fbdevhw.c, 1.1.4.2, 1.1.4.3 fbdevhw.man, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/fbdevhw
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/fbdevhw

Modified Files:
      Tag: XORG-CURRENT
	fbdevhw.c fbdevhw.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: fbdevhw.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/fbdevhw.c	5 Mar 2004 13:40:47 -0000	1.1.4.2
+++ b/fbdevhw.c	15 Apr 2004 10:16:49 -0000	1.1.4.3
@@ -40,7 +40,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	0, 0, 2,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,

Index: fbdevhw.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/fbdevhw.man	5 Mar 2004 13:40:47 -0000	1.1.4.1
+++ b/fbdevhw.man	15 Apr 2004 10:16:49 -0000	1.1.4.2
@@ -14,7 +14,8 @@
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), 
+xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 fbdev(__drivermansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr, based on the XF68_FBDev Server code