diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
| commit | ec67fbe7f1eee2b2b02fc6ba88685d9a59c9def9 (patch) | |
| tree | 52d63fcaa6b9d4ad48b2290c12b491864ece4d37 | |
| parent | 6cf5747580a3293a8ea2ce16213d092c90a162a4 (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-- | fslsfonts.c | 2 | ||||
| -rw-r--r-- | fslsfonts.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fslsfonts.c b/fslsfonts.c index 2ca2baf..9760db2 100644 --- a/fslsfonts.c +++ b/fslsfonts.c @@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.8 2001/12/14 20:00:45 dawes Exp $ */ +/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */ #include <X11/fonts/FSlib.h> #include <stdio.h> diff --git a/fslsfonts.man b/fslsfonts.man index 2dfb2ad..891aa0e 100644 --- a/fslsfonts.man +++ b/fslsfonts.man @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.7 2001/12/14 20:00:45 dawes Exp $ +.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $ .\" .TH FSLSFONTS 1 __xorgversion__ .SH NAME |