18. Merged in XFree86 code up to 4.4.0 including changes to files that hadRELEASE-1-PREUPDATE

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

14 files changed, 14 insertions, 14 deletions

diff --git a/include/X11/extensions/Xrender.h b/include/X11/extensions/Xrender.h
index 68f6b0a..1c05cea 100644
--- a/include/X11/extensions/Xrender.h
+++ b/include/X11/extensions/Xrender.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Xrender.h,v 1.18 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Xrender.h,v 1.17 2002/11/06 22:47:49 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Color.c b/src/Color.c
index 53af267..2330bfd 100644
--- a/src/Color.c
+++ b/src/Color.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Color.c,v 1.1 2002/05/17 22:34:18 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/Composite.c b/src/Composite.c
index b58c935..b2c65db 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Composite.c,v 1.2 2000/08/28 02:43:13 tsi Exp $
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Cursor.c b/src/Cursor.c
index b1a8e2b..2ed505e 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Cursor.c,v 1.3 2002/11/24 21:46:15 tsi Exp $
+ * $XFree86: xc/lib/Xrender/Cursor.c,v 1.2tsi Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/FillRect.c b/src/FillRect.c
index 15e3875..c9c16f9 100644
--- a/src/FillRect.c
+++ b/src/FillRect.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/FillRect.c,v 1.2 2001/12/16 18:27:55 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/FillRects.c b/src/FillRects.c
index b251930..f132d3d 100644
--- a/src/FillRects.c
+++ b/src/FillRects.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/FillRects.c,v 1.2 2001/12/16 18:27:55 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Filter.c b/src/Filter.c
index dfc5480..f4f3bd2 100644
--- a/src/Filter.c
+++ b/src/Filter.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/Glyph.c b/src/Glyph.c
index 6495e53..4d5d4d4 100644
--- a/src/Glyph.c
+++ b/src/Glyph.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Glyph.c,v 1.12 2002/11/05 23:22:35 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Glyph.c,v 1.11 2002/10/18 01:13:39 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Picture.c b/src/Picture.c
index 32ab263..1f0e1df 100644
--- a/src/Picture.c
+++ b/src/Picture.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Picture.c,v 1.9 2002/09/26 02:56:52 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Picture.c,v 1.6 2000/12/05 07:42:29 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Poly.c b/src/Poly.c
index a6856fb..fd0df05 100644
--- a/src/Poly.c
+++ b/src/Poly.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Poly.c,v 1.7 2002/06/04 23:22:36 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Poly.c,v 1.6 2002/05/21 20:39:50 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/Trap.c b/src/Trap.c
index 07304f5..0a4bc3c 100644
--- a/src/Trap.c
+++ b/src/Trap.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Trap.c,v 1.3 2002/11/05 23:22:35 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Trap.c,v 1.2 2002/09/27 16:40:11 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/Tri.c b/src/Tri.c
index ead95a3..44e87e0 100644
--- a/src/Tri.c
+++ b/src/Tri.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Tri.c,v 1.3 2002/11/05 23:22:35 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Tri.c,v 1.2 2002/05/15 06:43:22 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/Xrender.c b/src/Xrender.c
index 45d929d..346115f 100644
--- a/src/Xrender.c
+++ b/src/Xrender.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Xrender.c,v 1.14 2002/11/22 02:10:41 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Xrender.c,v 1.12 2002/09/29 23:39:44 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/Xrenderint.h b/src/Xrenderint.h
index cfd5824..98f5ddb 100644
--- a/src/Xrenderint.h
+++ b/src/Xrenderint.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrender/Xrenderint.h,v 1.4 2002/11/05 23:22:35 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Xrenderint.h,v 1.3 2002/09/26 02:56:52 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *