From e0972b5ba2e9a39f5afa6ad17668dfa517e04cea Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:38:51 +0000 Subject: [PATCH] 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). --- Print.h | 2 +- Printstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Print.h b/Print.h index dc9c66d..2d45082 100644 --- a/Print.h +++ b/Print.h @@ -57,7 +57,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp $ */ #ifndef _XpPrint_H_ #define _XpPrint_H_ diff --git a/Printstr.h b/Printstr.h index a518da8..164e2f3 100644 --- a/Printstr.h +++ b/Printstr.h @@ -43,7 +43,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Printstr.h,v 1.6 2001/08/23 12:46:11 alanh Exp $ */ +/* $XFree86: xc/include/extensions/Printstr.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */ #ifndef _XpPrintstr_H_