From 28eb77d136d2c43d655fe8ad8a77665381bd97c5 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:02 +0000
Subject: Merging XORG-CURRENT into trunk

---
 src/xf86Dyna.c | 4 ++--
 src/xf86Dyna.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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_
-- 
cgit v1.2.3