diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | d7f9e580889b457d1c913229e5a6da198a7afc10 (patch) | |
| tree | 50ca27fbac2c4024e3036176daeada77104bfae3 | |
| parent | 258c66ae0da974c415026fcf4961b1ced793eaaf (diff) | |
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-CURRENTXACE-SELINUXDAMAGE-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-- | XResproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/XResproto.h b/XResproto.h index 754b502..2f5563b 100644 --- a/XResproto.h +++ b/XResproto.h @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/include/extensions/XResproto.h,v 1.2 2002/03/10 22:05:51 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/XResproto.h,v 1.1 2002/03/04 19:31:35 mvojkovi Exp $ */ #ifndef _XRESPROTO_H #define _XRESPROTO_H |