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/xf1bpp | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'hw/xfree86/xf1bpp')
| -rw-r--r-- | hw/xfree86/xf1bpp/mfbmap.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/xf1bpp/mfbmap.sh | 2 | ||||
| -rw-r--r-- | hw/xfree86/xf1bpp/mfbmodule.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/xf1bpp/mfbunmap.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/xf1bpp/mfbunmap.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index e72fa4316..a29332497 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh index a8f43eceb..514040776 100644 --- a/hw/xfree86/xf1bpp/mfbmap.sh +++ b/hw/xfree86/xf1bpp/mfbmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.1.2.3 1998/06/27 14:48:23 dawes Exp $ # # This script recreates the mapping list that maps the mfb external # symbols * to xf1bpp* (without "mfb") diff --git a/hw/xfree86/xf1bpp/mfbmodule.c b/hw/xfree86/xf1bpp/mfbmodule.c index 4fb795152..81baf5d7e 100644 --- a/hw/xfree86/xf1bpp/mfbmodule.c +++ b/hw/xfree86/xf1bpp/mfbmodule.c @@ -35,7 +35,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_ANSIC, /* Only need ansic layer */ ABI_ANSIC_VERSION, diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 94c029856..0134872e0 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh index 6b244e68e..44dc781fc 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.sh +++ b/hw/xfree86/xf1bpp/mfbunmap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ # # This script recreates a header that undoes the effect of mfbmap.h # This should only be rerun if there have been changes in the mfb code |