diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:28 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:28 +0000 |
| commit | 56cd2e432b29a8a4bf4ba2e5411c116c50b7d87a (patch) | |
| tree | f257883a326c92113f0078f27f1d2a61a4bc3066 /utils.h | |
| parent | 5be0ac3f15b0de8981560ada5939e11a62a9d326 (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).
Diffstat (limited to 'utils.h')
| -rw-r--r-- | utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.6 2002/12/24 17:43:00 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.5 2002/06/05 00:00:37 dawes Exp $ */ /***====================================================================***/ |