summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:05 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:05 +0000
commit3a24723ead61e472581081753453d84c6e2a926f (patch)
tree6cd14ece4067c674a78319c0a5db8a31d25cd113
parent04636ebbd2f9ee1f360f8d731d00b2665e010e57 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--man/elographics.man2
-rw-r--r--src/xf86Elo.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/elographics.man b/man/elographics.man
index 4e78d67..d219a08 100644
--- a/man/elographics.man
+++ b/man/elographics.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ELOGRAPHICS __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 8c57432..004b8b4 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -22,7 +22,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */
/*
*******************************************************************************