diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
commit | f5c1c2f13cc7c19d81cd8b2f2ed6150e3bb5f37f (patch) | |
tree | a106c3a319e07298a4abd20257a044dcffc7e78a /xfontsel.c | |
parent | fbd548db7345a323d1d1f6948aed89b130b6b36d (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 'xfontsel.c')
-rw-r--r-- | xfontsel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ Author: Ralph R. Swick, DEC/MIT Project Athena one weekend in November, 1989 Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text. */ -/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.8 2003/05/27 22:27:05 tsi Exp $ */ +/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.7tsi Exp $ */ #include <stdio.h> #include <stdlib.h> |