diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
| commit | cc17fef21663a68aad3f355ae34f71c96d61dad5 (patch) | |
| tree | 6cd14ece4067c674a78319c0a5db8a31d25cd113 | |
| parent | 04636ebbd2f9ee1f360f8d731d00b2665e010e57 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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/elographics.man | 2 | ||||
| -rw-r--r-- | src/xf86Elo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/elographics.man b/man/elographics.man index 4e78d67..d219a08 100644 --- a/man/elographics.man +++ b/man/elographics.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH ELOGRAPHICS __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Elo.c b/src/xf86Elo.c index 8c57432..004b8b4 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -22,7 +22,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */ /* ******************************************************************************* |