diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
commit | 28eb77d136d2c43d655fe8ad8a77665381bd97c5 (patch) | |
tree | 6e584c49165ea73d5cced8831556c66163bd2405 /src | |
parent | 43b7590380650bc97ccb198fdf95acd6c5b51cfe (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
Diffstat (limited to 'src')
-rw-r--r-- | src/xf86Dyna.c | 4 | ||||
-rw-r--r-- | src/xf86Dyna.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xf86Dyna.c b/src/xf86Dyna.c index 8da2cdb..23821e5 100644 --- a/src/xf86Dyna.c +++ b/src/xf86Dyna.c @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.c,v 1.4 2001/11/26 16:25:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.c,v 1.3 2000/08/11 19:10:43 dawes Exp $ */ #define _DYNAPRO_C_ @@ -62,7 +62,7 @@ static XF86ModuleVersionInfo VersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, diff --git a/src/xf86Dyna.h b/src/xf86Dyna.h index 294c650..c6f0e60 100644 --- a/src/xf86Dyna.h +++ b/src/xf86Dyna.h @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.h,v 1.1 1999/06/12 15:37:10 dawes Exp $ */ #ifndef _DYNAPRO_H_ #define _DYNAPRO_H_ |