diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
| commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
| tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /hw/xfree86/vgahw | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'hw/xfree86/vgahw')
| -rw-r--r-- | hw/xfree86/vgahw/vgaCmap.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/vgahw/vgaHWmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index a70f572b5..28f8b6fc7 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c index 409e7b511..d6044bbb7 100644 --- a/hw/xfree86/vgahw/vgaHWmodule.c +++ b/hw/xfree86/vgahw/vgaHWmodule.c @@ -14,7 +14,7 @@ static XF86ModuleVersionInfo VersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0, 1, 0, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |