summaryrefslogtreecommitdiff
path: root/src/fc/fservestr.h
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/fc/fservestr.h
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/fc/fservestr.h')
-rw-r--r--src/fc/fservestr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h
index 20c85f6..0e41666 100644
--- a/src/fc/fservestr.h
+++ b/src/fc/fservestr.h
@@ -23,7 +23,7 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */
#ifndef _FSERVESTR_H_
#define _FSERVESTR_H_