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).

19 files changed, 19 insertions, 19 deletions

diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h
index db3cd24..5fe5545 100644
--- a/include/X11/Xft/Xft.h
+++ b/include/X11/Xft/Xft.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/Xft.h,v 1.33 2003/11/20 22:36:33 dawes Exp $
+ * $XFree86: xc/lib/Xft/Xft.h,v 1.32 2003/02/25 21:57:53 dawes Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h
index 470b750..4f07ec1 100644
--- a/include/X11/Xft/XftCompat.h
+++ b/include/X11/Xft/XftCompat.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/XftCompat.h,v 1.6 2003/08/06 14:03:59 eich Exp $
+ * $XFree86: xc/lib/Xft/XftCompat.h,v 1.4 2002/05/24 05:54:02 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftcolor.c b/src/xftcolor.c
index 7a5005d..05faf0d 100644
--- a/src/xftcolor.c
+++ b/src/xftcolor.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftcolor.c,v 1.3 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftcolor.c,v 1.1 2000/12/01 03:27:57 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftcore.c b/src/xftcore.c
index 25e78b7..7e3dc04 100644
--- a/src/xftcore.c
+++ b/src/xftcore.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftcore.c,v 1.14 2003/05/27 22:26:40 tsi Exp $
+ * $XFree86: xc/lib/Xft/xftcore.c,v 1.13tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftdbg.c b/src/xftdbg.c
index 4f5a6cf..8c0c13c 100644
--- a/src/xftdbg.c
+++ b/src/xftdbg.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftdbg.c,v 1.4 2002/02/15 07:36:10 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftdbg.c,v 1.3 2001/03/31 01:57:20 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftdpy.c b/src/xftdpy.c
index 09f5f0e..8384be5 100644
--- a/src/xftdpy.c
+++ b/src/xftdpy.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftdpy.c,v 1.20 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftdpy.c,v 1.18 2002/10/02 07:02:32 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftdraw.c b/src/xftdraw.c
index e25bf5b..b6d8542 100644
--- a/src/xftdraw.c
+++ b/src/xftdraw.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftdraw.c,v 1.26 2003/04/03 22:25:50 dawes Exp $
+ * $XFree86: xc/lib/Xft/xftdraw.c,v 1.25 2002/10/11 17:53:02 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftextent.c b/src/xftextent.c
index d8e91e5..9e3e4e3 100644
--- a/src/xftextent.c
+++ b/src/xftextent.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftextent.c,v 1.10 2002/12/14 01:59:38 dawes Exp $
+ * $XFree86: xc/lib/Xft/xftextent.c,v 1.9 2002/10/11 17:53:02 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftfont.c b/src/xftfont.c
index 7698d60..de11c28 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftfont.c,v 1.11 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftfont.c,v 1.9 2002/02/15 07:36:11 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftfreetype.c b/src/xftfreetype.c
index 6fce545..2846065 100644
--- a/src/xftfreetype.c
+++ b/src/xftfreetype.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.30 2003/03/26 20:43:51 tsi Exp $
+ * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.29tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 900f1f5..8fa633f 100644
--- a/src/xftglyphs.c
+++ b/src/xftglyphs.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.24 2003/11/20 22:36:33 dawes Exp $
+ * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.23 2002/10/11 17:53:02 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftinit.c b/src/xftinit.c
index b858503..5894725 100644
--- a/src/xftinit.c
+++ b/src/xftinit.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftinit.c,v 1.5 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftinit.c,v 1.3 2002/02/15 07:36:11 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftint.h b/src/xftint.h
index f867cec..868360e 100644
--- a/src/xftint.h
+++ b/src/xftint.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftint.h,v 1.37 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftint.h,v 1.36 2002/08/22 08:09:40 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftlist.c b/src/xftlist.c
index e96f553..3a4a312 100644
--- a/src/xftlist.c
+++ b/src/xftlist.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftlist.c,v 1.4 2003/08/06 14:03:59 eich Exp $
+ * $XFree86: xc/lib/Xft/xftlist.c,v 1.2 2000/12/07 23:57:28 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftname.c b/src/xftname.c
index ae0ab2e..687006b 100644
--- a/src/xftname.c
+++ b/src/xftname.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftname.c,v 1.12 2002/05/24 07:02:38 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftname.c,v 1.11 2002/02/15 07:36:11 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftrender.c b/src/xftrender.c
index 1836a14..60ca222 100644
--- a/src/xftrender.c
+++ b/src/xftrender.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftrender.c,v 1.15 2002/12/14 01:59:38 dawes Exp $
+ * $XFree86: xc/lib/Xft/xftrender.c,v 1.14 2002/10/11 17:53:02 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftstr.c b/src/xftstr.c
index 473ffad..33043cf 100644
--- a/src/xftstr.c
+++ b/src/xftstr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftstr.c,v 1.7 2002/02/15 07:36:11 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftstr.c,v 1.6 2001/04/01 14:00:01 tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftswap.c b/src/xftswap.c
index d9c5313..ce813f5 100644
--- a/src/xftswap.c
+++ b/src/xftswap.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftswap.c,v 1.1 2002/02/15 07:37:35 keithp Exp $
+ * $XFree86: $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/src/xftxlfd.c b/src/xftxlfd.c
index dd15630..84e394b 100644
--- a/src/xftxlfd.c
+++ b/src/xftxlfd.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xft/xftxlfd.c,v 1.10 2003/05/27 22:26:41 tsi Exp $
+ * $XFree86: xc/lib/Xft/xftxlfd.c,v 1.9tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *