[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/vbe vbe_module.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

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


Index: vbe_module.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,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/vbe_module.c	5 Mar 2004 13:40:58 -0000	1.1.4.1
+++ b/vbe_module.c	15 Apr 2004 10:17:14 -0000	1.1.4.2
@@ -16,7 +16,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 1, 0,
     ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */
     ABI_VIDEODRV_VERSION,