summaryrefslogtreecommitdiff
path: root/src/Composite.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:00 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:00 +0000
commitca25a54ff3021e018800679963324866d301eedf (patch)
tree95523639c16fcf0d75ff25d451e8acbe10699e4e /src/Composite.c
parent83d1e5e98d6ff17682f365b26794dc0f2a909b7c (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/Composite.c')
-rw-r--r--src/Composite.c2
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"