diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | e5e3cbfd5727dd28b4c15d0641d45c6a1610b80c (patch) | |
| tree | b89288398231b2f217e83ef9ef6906e3e5f28421 | |
| parent | e9ccdf96c427891bf73405d6512d1ae1f23d050d (diff) | |
| download | xorg-proto-xcmiscproto-e5e3cbfd5727dd28b4c15d0641d45c6a1610b80c.tar.gz | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-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-- | xcmiscstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xcmiscstr.h b/xcmiscstr.h index f1ce46a..2aa45e6 100644 --- a/xcmiscstr.h +++ b/xcmiscstr.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ |