From 22c7560ce8835074d16eb9568213532338a07a7c Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:13 +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).

---
 fonttosfnt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fonttosfnt.h')

diff --git a/fonttosfnt.h b/fonttosfnt.h
index 128d2cc..b7392a7 100644
--- a/fonttosfnt.h
+++ b/fonttosfnt.h
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.5 2003/11/21 05:22:09 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.4 2003/10/24 20:38:11 tsi Exp $ */
 
 #ifndef _FONTTOSFNT_H_
 #define _FONTTOSFNT_H_ 1
-- 
cgit v1.2.3