diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
commit | 8e011d6aeb47ce278985ccd572ab4c501826e2f8 (patch) | |
tree | c502d7f0121c6213d919940d616f812b5405a4d6 | |
parent | b8cfb117f509fd0ce35f3cb3cb2d65111689b9c2 (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-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-- | makepsres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makepsres.c b/makepsres.c index edee93d..e8e445e 100644 --- a/makepsres.c +++ b/makepsres.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.9 2003/10/24 20:38:13 tsi Exp $ */ +/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.8tsi Exp $ */ #include <stdio.h> #include <stdlib.h> |