summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:51 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:51 +0000
commit229911f0c4a66714afda1264f8eb9d6148975e91 (patch)
treeea24a2fd891df98440d52f0c23f365c4969eaffb /src
parente2f0f853272e66036193812c8ead7c797b0d41cf (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src')
-rw-r--r--src/void.c2
1 files changed, 1 insertions, 1 deletions
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.