From 7b4130c9afb9fa99d129468c08e2ecabfa36ce13 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:48:05 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

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

diff --git a/src/elo.c b/src/elo.c
index e125c1b..1ed8be4 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -48,7 +48,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c,v 1.11 2001/11/26 16:25:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.c,v 1.10 2000/08/11 19:10:44 dawes Exp $ */
 
 #define _elo_C_
 /*****************************************************************************
diff --git a/src/elo.h b/src/elo.h
index dcdd6ff..e881ccb 100644
--- a/src/elo.h
+++ b/src/elo.h
@@ -24,7 +24,7 @@
  * in this Software without prior written authorization from Metro Link.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.h,v 1.2 1999/02/01 12:12:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elo2300/elo.h,v 1.1 1998/12/05 14:40:16 dawes Exp $ */
 
 #ifndef	_elo_H_
 #define _elo_H_
-- 
cgit v1.2.3