diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:30 +0000 |
| commit | e1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch) | |
| tree | c501bcce6e36b6d99cc6e190e446c076efe85f02 /src/Composite.c | |
| parent | 2928a163b235d91385874aa6a1a6f893b045f606 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'src/Composite.c')
| -rw-r--r-- | src/Composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Composite.c b/src/Composite.c index c3612cc..a2e43f4 100644 --- a/src/Composite.c +++ b/src/Composite.c @@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Composite.c,v 1.6 2001/12/14 19:56:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */ #define COMPOSITE #include "IntrinsicI.h" |