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).
This commit is contained in:
Egbert Eich 2004-03-05 13:38:51 +00:00
parent 498f7aff52
commit e0972b5ba2
2 changed files with 2 additions and 2 deletions

View file

@ -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_

View file

@ -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_