From dfea6bec2d256b103fa2ff235d1f4c5d847575e7 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:47:13 +0000
Subject: 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).

---
 src/Speedo/bics-iso.h     | 2 +-
 src/Speedo/bics-unicode.c | 2 +-
 src/Speedo/bics-unicode.h | 2 +-
 src/Speedo/do_char.c      | 2 +-
 src/Speedo/do_trns.c      | 2 +-
 src/Speedo/out_bl2d.c     | 2 +-
 src/Speedo/out_blk.c      | 2 +-
 src/Speedo/out_scrn.c     | 2 +-
 src/Speedo/out_util.c     | 2 +-
 src/Speedo/reset.c        | 2 +-
 src/Speedo/set_spcs.c     | 2 +-
 src/Speedo/set_trns.c     | 2 +-
 src/Speedo/spdo_prv.h     | 2 +-
 src/Speedo/speedo.h       | 2 +-
 src/Speedo/spencode.c     | 2 +-
 src/Speedo/sperr.c        | 2 +-
 src/Speedo/spfile.c       | 2 +-
 src/Speedo/spfont.c       | 2 +-
 src/Speedo/spfuncs.c      | 2 +-
 src/Speedo/spglyph.c      | 2 +-
 src/Speedo/spinfo.c       | 2 +-
 src/Speedo/spint.h        | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/Speedo')

diff --git a/src/Speedo/bics-iso.h b/src/Speedo/bics-iso.h
index d3cd35b..4964fa3 100644
--- a/src/Speedo/bics-iso.h
+++ b/src/Speedo/bics-iso.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.7 2001/12/14 19:56:41 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.6 2001/01/17 19:43:17 dawes Exp $ */
 
 int  sp_bics_map[] = {
     32, 0,
diff --git a/src/Speedo/bics-unicode.c b/src/Speedo/bics-unicode.c
index 22eed88..d1733cb 100644
--- a/src/Speedo/bics-unicode.c
+++ b/src/Speedo/bics-unicode.c
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/Speedo/bics-unicode.c,v 1.1 1999/01/31 04:59:25 dawes Exp $ */
+/* $XFree86$ */
 
 /* These data are very dodgy. */
 
diff --git a/src/Speedo/bics-unicode.h b/src/Speedo/bics-unicode.h
index 3cf2ae4..90fa188 100644
--- a/src/Speedo/bics-unicode.h
+++ b/src/Speedo/bics-unicode.h
@@ -1,3 +1,3 @@
-/* $XFree86: xc/lib/font/Speedo/bics-unicode.h,v 1.1 1999/01/31 04:59:26 dawes Exp $ */
+/* $XFree86$ */
 
 int unicode_to_bics(unsigned);
diff --git a/src/Speedo/do_char.c b/src/Speedo/do_char.c
index f28af7c..c45bb5f 100644
--- a/src/Speedo/do_char.c
+++ b/src/Speedo/do_char.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 /***************************** D O - C H A R . C *****************************
  *                                                                           *
diff --git a/src/Speedo/do_trns.c b/src/Speedo/do_trns.c
index 25bc02a..2e397e8 100644
--- a/src/Speedo/do_trns.c
+++ b/src/Speedo/do_trns.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 /**************************** D O _ T R N S . C ******************************
  *                                                                           *
diff --git a/src/Speedo/out_bl2d.c b/src/Speedo/out_bl2d.c
index 74a7310..61995e1 100644
--- a/src/Speedo/out_bl2d.c
+++ b/src/Speedo/out_bl2d.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.4 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.3 1999/02/07 11:47:14 dawes Exp $ */
 
 /*************************** O U T _ B L 2 D . C *****************************
  *                                                                           *
diff --git a/src/Speedo/out_blk.c b/src/Speedo/out_blk.c
index e56eb1b..3ecefcc 100644
--- a/src/Speedo/out_blk.c
+++ b/src/Speedo/out_blk.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.2 1999/02/07 06:18:16 dawes Exp $ */
 
 
 /*************************** O U T _ B L K . C *********************************
diff --git a/src/Speedo/out_scrn.c b/src/Speedo/out_scrn.c
index e17f7f6..8e1b48f 100644
--- a/src/Speedo/out_scrn.c
+++ b/src/Speedo/out_scrn.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.5 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.4 1999/12/27 00:39:25 robin Exp $ */
 
 
 /*************************** O U T _ S C R N . C *****************************
diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c
index 357763f..a6f02f0 100644
--- a/src/Speedo/out_util.c
+++ b/src/Speedo/out_util.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */
 
 
 #define	DEBUG	0
diff --git a/src/Speedo/reset.c b/src/Speedo/reset.c
index 7711951..982d644 100644
--- a/src/Speedo/reset.c
+++ b/src/Speedo/reset.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */
 
 
 
diff --git a/src/Speedo/set_spcs.c b/src/Speedo/set_spcs.c
index 14ab53e..df45943 100644
--- a/src/Speedo/set_spcs.c
+++ b/src/Speedo/set_spcs.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 
 /*************************** S E T _ S P C S . C *****************************
diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c
index 18d87ec..18cdb46 100644
--- a/src/Speedo/set_trns.c
+++ b/src/Speedo/set_trns.c
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.6 2003/05/27 22:26:44 tsi Exp $ */
+/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.5tsi Exp $ */
 
 
 
diff --git a/src/Speedo/spdo_prv.h b/src/Speedo/spdo_prv.h
index 272ffbf..162c0fd 100644
--- a/src/Speedo/spdo_prv.h
+++ b/src/Speedo/spdo_prv.h
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.5 2001/01/17 19:43:18 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.4 1999/03/14 03:21:17 dawes Exp $ */
 
 
 
diff --git a/src/Speedo/speedo.h b/src/Speedo/speedo.h
index a0b607f..5eb516c 100644
--- a/src/Speedo/speedo.h
+++ b/src/Speedo/speedo.h
@@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED
 WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
 
 */
-/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.6 2001/07/25 15:04:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.5 2001/01/17 19:43:18 dawes Exp $ */
 
 #ifndef _SPEEDO_H_
 #define _SPEEDO_H_
diff --git a/src/Speedo/spencode.c b/src/Speedo/spencode.c
index 0daccff..b06798c 100644
--- a/src/Speedo/spencode.c
+++ b/src/Speedo/spencode.c
@@ -47,7 +47,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.7 2001/12/14 19:56:41 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.6 2001/01/17 19:43:18 dawes Exp $ */
 
 #include	"spint.h"
 
diff --git a/src/Speedo/sperr.c b/src/Speedo/sperr.c
index 8be42c6..82ed532 100644
--- a/src/Speedo/sperr.c
+++ b/src/Speedo/sperr.c
@@ -52,7 +52,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.7 2002/05/31 18:45:48 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.6 2001/12/14 19:56:41 dawes Exp $ */
 
 #include	"spint.h"
 
diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c
index a5c34b3..ef2a764 100644
--- a/src/Speedo/spfile.c
+++ b/src/Speedo/spfile.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.14 2001/12/14 19:56:41 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */
 
 #include "fntfilst.h"
 #include "fontenc.h"
diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 7799eef..04d2f90 100644
--- a/src/Speedo/spfont.c
+++ b/src/Speedo/spfont.c
@@ -21,7 +21,7 @@
  *
  * Author: Dave Lemke, Network Computing Devices Inc
  */
-/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.13 2003/05/27 22:26:44 tsi Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.12tsi Exp $ */
 
 /*
 
diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c
index 18204eb..75f779b 100644
--- a/src/Speedo/spfuncs.c
+++ b/src/Speedo/spfuncs.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.8 2001/12/14 19:56:42 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.7 2001/08/27 19:49:51 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <X11/Xos.h>
diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c
index 6db6302..979a472 100644
--- a/src/Speedo/spglyph.c
+++ b/src/Speedo/spglyph.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.7 2001/12/14 19:56:42 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */
 
 #include	<X11/X.h>	/* for bit order #defines */
 #include	"spint.h"
diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c
index d857485..d7c9c0e 100644
--- a/src/Speedo/spinfo.c
+++ b/src/Speedo/spinfo.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.13 2002/09/10 16:14:33 tsi Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */
 
 #include "fntfilst.h"
 #include "fontutil.h"
diff --git a/src/Speedo/spint.h b/src/Speedo/spint.h
index 377edd8..18e5203 100644
--- a/src/Speedo/spint.h
+++ b/src/Speedo/spint.h
@@ -47,7 +47,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.10 2001/12/14 19:56:42 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.9 2001/01/17 19:43:20 dawes Exp $ */
 
 #ifndef _SPINT_H_
 #define _SPINT_H_
-- 
cgit v1.2.3