diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
commit | ef54af6879c34f713ff84d27b00582b76a8bc1bc (patch) | |
tree | bb88bdbfc8abe7cda1b7fad284bec4b83b7cfdc7 /RenderLogo.h | |
parent | ee71467ec896d97b69d5353f0804a65f1aa5a056 (diff) |
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-CURRENTDAMAGE-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 'RenderLogo.h')
-rw-r--r-- | RenderLogo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RenderLogo.h b/RenderLogo.h index 4d6b8cb..e695d77 100644 --- a/RenderLogo.h +++ b/RenderLogo.h @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlogo/RenderLogo.h,v 1.2 2002/07/01 02:26:04 tsi Exp $ */ +/* $XFree86$ */ #ifndef _RenderLogo_h #define _RenderLogo_h |