From fb768609ea31ca228c1d97a997bbcb62a496984b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:42 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- src/fc/fslibos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fc/fslibos.h') diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h index 09f1ade..8d3ff55 100644 --- a/src/fc/fslibos.h +++ b/src/fc/fslibos.h @@ -31,7 +31,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.9 2003/09/01 20:50:44 herrb Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */ /* * FSlib networking & os include file -- cgit v1.2.3