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
commit3b376ef7c9d6e5a86d18613c412e533712a40c45 (patch)
treeea24a2fd891df98440d52f0c23f365c4969eaffb
parente2f0f853272e66036193812c8ead7c797b0d41cf (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/void.man2
-rw-r--r--src/void.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/void.man b/man/void.man
index 32b1189..04c2ae0 100644
--- a/man/void.man
+++ b/man/void.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.2 2001/01/27 18:20:58 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.1 2001/01/24 00:06:38 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VOID __drivermansuffix__ __vendorversion__
diff --git a/src/void.c b/src/void.c
index 15cc38b..21c91e0 100644
--- a/src/void.c
+++ b/src/void.c
@@ -21,7 +21,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.2 2000/08/11 19:10:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.1 1999/11/19 13:54:57 hohndel Exp $ */
/* Input device which doesn't output any event. This device can be used
* as a core pointer or as a core keyboard.