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 | d0a7730c371ee92c8113386d1c69e4882d990151 (patch) | |
| tree | 6961433eb2265b7a89b5b9d4ce30cc6dc175143d | |
| parent | 95f757be3cab72546c7c578d983a6344e0aa64cb (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-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/xf86HyperPen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index af3d4d6..dfd78ad 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -35,7 +35,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.10 2003/11/17 22:20:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.9 2003/09/24 03:16:59 dawes Exp $ */ #include <xf86Version.h> @@ -1484,7 +1484,7 @@ XF86ModuleVersionInfo xf86HyperPenVersion = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0x00010000, {0,0,0,0} }; @@ -1766,7 +1766,7 @@ static XF86ModuleVersionInfo xf86HypVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |