[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/s3 s3_driver.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

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

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


Index: s3_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/s3_driver.c	5 Mar 2004 13:40:30 -0000	1.1.4.3
+++ b/s3_driver.c	15 Apr 2004 10:16:32 -0000	1.1.4.4
@@ -258,7 +258,7 @@
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
         ABI_CLASS_VIDEODRV,
         ABI_VIDEODRV_VERSION,