diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:51 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:51 +0000 |
commit | e0972b5ba2e9a39f5afa6ad17668dfa517e04cea (patch) | |
tree | e088eed0f832dc93ea531e3ef3e9e459cc9831ae | |
parent | 498f7aff528f11f2ad33a659c1634ae74d291aba (diff) | |
download | xorg-proto-printproto-e0972b5ba2e9a39f5afa6ad17668dfa517e04cea.tar.gz |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-XFIXES
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).
-rw-r--r-- | Print.h | 2 | ||||
-rw-r--r-- | Printstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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_ @@ -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_ |