18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGEIPv6-REVIEW-BASEXORG-RELEASE-1-TMXORG-RELEASE-1-STSFIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

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_