summaryrefslogtreecommitdiff
path: root/src/util/format.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:42 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:42 +0000
commitfb768609ea31ca228c1d97a997bbcb62a496984b (patch)
tree50731fff7a4af82c16152ec82b5bc832621a52c5 /src/util/format.c
parent9fb403503248fea923533300380cfc4bbb45823a (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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 'src/util/format.c')
-rw-r--r--src/util/format.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/format.c b/src/util/format.c
index c406009..596e6eb 100644
--- a/src/util/format.c
+++ b/src/util/format.c
@@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/util/format.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
#include "FSproto.h"
#include "font.h"