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 /xlogo.c | |
| 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 'xlogo.c')
| -rw-r--r-- | xlogo.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.9 2002/05/23 23:53:59 keithp Exp $ */ +/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> |