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 | 362458c418c47acb321f13a791d1836e8c13cbfb (patch) | |
| tree | e67c954aeadf758e673b7dbfe434dac91906f8b0 | |
| parent | 734e34ec1b2a3babcb2a2688be4a8edb322dbb19 (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-- | saverproto.h | 2 | ||||
| -rw-r--r-- | scrnsaver.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/saverproto.h b/saverproto.h index dd06ed5..1a671af 100644 --- a/saverproto.h +++ b/saverproto.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/include/extensions/saverproto.h,v 3.2 2002/09/16 18:05:19 eich Exp $ */ +/* $XFree86$ */ #ifndef _SAVERPROTO_H_ #define _SAVERPROTO_H_ diff --git a/scrnsaver.h b/scrnsaver.h index fa2bc94..2596a6d 100644 --- a/scrnsaver.h +++ b/scrnsaver.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/include/extensions/scrnsaver.h,v 3.1 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ #ifndef _SCRNSAVER_H_ #define _SCRNSAVER_H_ |