summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:06 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:06 +0000
commit15e5fb2065447d5af0f397f1e722ccd9e0128edf (patch)
tree30b6b323dbabf0eff07c3250ebd8ff7dbbdfb41a
parentb56bded696b6fa33bacec0481774b79a5675343b (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-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--man/ur98.man2
-rw-r--r--src/xf86Ur-98.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/ur98.man b/man/ur98.man
index b699a0f..9fa829e 100644
--- a/man/ur98.man
+++ b/man/ur98.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/ur98.man,v 1.1 2002/11/22 03:49:15 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man,v 1.1 2001/01/24 00:06:37 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH UR98 __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c
index 66aa283..a32f124 100644
--- a/src/xf86Ur-98.c
+++ b/src/xf86Ur-98.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */
#include <sys/types.h>
#include <unistd.h>