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 /src/xf86Dyna.h | |
| 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).
Diffstat (limited to 'src/xf86Dyna.h')
| -rw-r--r-- | src/xf86Dyna.h | 2 |
1 files changed, 1 insertions, 1 deletions
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_ |