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
commit657ddaf3e87b23cad48d4664c28565ec0fed2c9d (patch)
tree5f6a195fd9fa2596609518b4a30168b198d52887
parent4ccaf67b4e81207fd9e2f314dff7191f3e1e128b (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/palmax.man2
-rw-r--r--src/xf86Palmax.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/palmax.man b/man/palmax.man
index 33d2dca..aec26fe 100644
--- a/man/palmax.man
+++ b/man/palmax.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/palmax/palmax.man,v 1.1 2002/11/22 03:40:22 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 PALMAX __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Palmax.c b/src/xf86Palmax.c
index 93db45b..7acfb87 100644
--- a/src/xf86Palmax.c
+++ b/src/xf86Palmax.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/palmax/xf86Palmax.c,v 1.2 2003/06/23 17:35:49 eich Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"