From 63a2155851c9052f259e9b7a62000fcdf6161e4c Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:31:17 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

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

(limited to 'src')

diff --git a/src/magellan.c b/src/magellan.c
index 5554a70..329933d 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_
 /*****************************************************************************
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_
-- 
cgit v1.2.3