diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
commit | 06c6b57b245cc7eb132b2b2fd7a143786b1a2fd5 (patch) | |
tree | 2ed761f13bee3c1db729d2990ff9c9d19032fcb8 /bdftopcf.c | |
parent | 5b48bdb73ba85b0d20cd5c8595f85d03e4d9f257 (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).
Diffstat (limited to 'bdftopcf.c')
-rw-r--r-- | bdftopcf.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.5 2001/12/14 20:00:39 dawes Exp $ */ +/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.4 2001/08/01 00:45:00 tsi Exp $ */ #include <X11/X.h> #include <X11/Xproto.h> |