diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | e1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch) | |
| tree | c501bcce6e36b6d99cc6e190e446c076efe85f02 /include/X11/ResConfigP.h | |
| parent | 2928a163b235d91385874aa6a1a6f893b045f606 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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 'include/X11/ResConfigP.h')
| -rw-r--r-- | include/X11/ResConfigP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h index 2fe22ee..a06cda7 100644 --- a/include/X11/ResConfigP.h +++ b/include/X11/ResConfigP.h @@ -52,7 +52,7 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H |