diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
| commit | 229911f0c4a66714afda1264f8eb9d6148975e91 (patch) | |
| tree | ea24a2fd891df98440d52f0c23f365c4969eaffb | |
| parent | e2f0f853272e66036193812c8ead7c797b0d41cf (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).
| -rw-r--r-- | man/void.man | 2 | ||||
| -rw-r--r-- | src/void.c | 2 |
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__ @@ -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. |