diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
| commit | c5c5a625b10ecebde38d73fabdebfb40b02b6c50 (patch) | |
| tree | 4224488e0fe4ad1d022bda8e3953dec3b86cea80 | |
| parent | 1034ff3c2b725bf1fdee087171616560558b7dee (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
| -rw-r--r-- | src/magellan.c | 4 | ||||
| -rw-r--r-- | src/magellan.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/magellan.c b/src/magellan.c index 5554a70..fac41b6 100644 --- a/src/magellan.c +++ b/src/magellan.c @@ -32,7 +32,7 @@ * port based on pre-XFree4.2.0 driver code v1.10 and XFree4.2.0 SpaceOrb driver code */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.c,v 1.11 2002/06/07 21:03:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.c,v 1.10 2001/11/26 16:25:53 dawes Exp $ */ #define _MAGELLAN_C_ /***************************************************************************** @@ -79,7 +79,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/magellan.h b/src/magellan.h index 4fbf4aa..88ac77e 100644 --- a/src/magellan.h +++ b/src/magellan.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.h,v 1.4 2002/06/07 21:03:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.h,v 1.3 1999/05/15 12:10:30 dawes Exp $ */ #ifndef _MAGELLAN_H_ #define _MAGELLAN_H_ |