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 | a483ac379d70b2e2e1c66a1517fe4b59978431d4 (patch) | |
| tree | 3b3b0943a5eac80b2a337d07cbe838e9cb390f04 | |
| parent | 1fc94a326113bb789b383c8d052add7de66fb923 (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/dynapro.man | 2 | ||||
| -rw-r--r-- | src/xf86Dyna.c | 2 | ||||
| -rw-r--r-- | src/xf86Dyna.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/dynapro.man b/man/dynapro.man index 7711c93..438f5b0 100644 --- a/man/dynapro.man +++ b/man/dynapro.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.man,v 1.1 2001/01/24 00:06:35 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH DYNAPRO __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Dyna.c b/src/xf86Dyna.c index 8da2cdb..d8baf4b 100644 --- a/src/xf86Dyna.c +++ b/src/xf86Dyna.c @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.c,v 1.4 2001/11/26 16:25:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.c,v 1.3 2000/08/11 19:10:43 dawes Exp $ */ #define _DYNAPRO_C_ diff --git a/src/xf86Dyna.h b/src/xf86Dyna.h index 294c650..c6f0e60 100644 --- a/src/xf86Dyna.h +++ b/src/xf86Dyna.h @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.h,v 1.1 1999/06/12 15:37:10 dawes Exp $ */ #ifndef _DYNAPRO_H_ #define _DYNAPRO_H_ |