From 8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Sun, 14 Mar 2004 08:32:37 +0000
Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST
 2004

---
 include/X11/fonts/bdfint.h   | 2 +-
 include/X11/fonts/bitmap.h   | 2 +-
 include/X11/fonts/bufio.h    | 2 +-
 include/X11/fonts/fntfil.h   | 2 +-
 include/X11/fonts/fntfilio.h | 2 +-
 include/X11/fonts/fntfilst.h | 2 +-
 include/X11/fonts/fontencc.h | 2 +-
 include/X11/fonts/fontmisc.h | 2 +-
 include/X11/fonts/fontmod.h  | 2 +-
 include/X11/fonts/fontutil.h | 2 +-
 include/X11/fonts/fontxlfd.h | 2 +-
 include/X11/fonts/pcf.h      | 2 +-
 src/FreeType/ft.h            | 2 +-
 src/FreeType/ftenc.c         | 2 +-
 src/FreeType/ftfuncs.c       | 2 +-
 src/FreeType/ftfuncs.h       | 2 +-
 src/FreeType/ftsystem.c      | 2 +-
 src/FreeType/fttools.c       | 2 +-
 src/FreeType/xttcap.c        | 2 +-
 src/FreeType/xttcap.h        | 2 +-
 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 +-
 src/Type1/afm.c              | 2 +-
 src/Type1/arith.c            | 2 +-
 src/Type1/arith.h            | 2 +-
 src/Type1/blues.h            | 2 +-
 src/Type1/cidchar.c          | 2 +-
 src/Type1/curves.c           | 2 +-
 src/Type1/curves.h           | 2 +-
 src/Type1/fontfcn.c          | 2 +-
 src/Type1/fontfcn.h          | 2 +-
 src/Type1/hints.c            | 2 +-
 src/Type1/hints.h            | 2 +-
 src/Type1/lines.c            | 2 +-
 src/Type1/lines.h            | 2 +-
 src/Type1/objects.c          | 2 +-
 src/Type1/objects.h          | 2 +-
 src/Type1/paths.c            | 2 +-
 src/Type1/paths.h            | 2 +-
 src/Type1/pictures.h         | 2 +-
 src/Type1/regions.c          | 2 +-
 src/Type1/regions.h          | 2 +-
 src/Type1/scanfont.c         | 2 +-
 src/Type1/spaces.c           | 2 +-
 src/Type1/spaces.h           | 2 +-
 src/Type1/t1funcs.c          | 2 +-
 src/Type1/t1imager.h         | 2 +-
 src/Type1/t1info.c           | 2 +-
 src/Type1/t1intf.h           | 2 +-
 src/Type1/t1io.c             | 2 +-
 src/Type1/t1malloc.c         | 2 +-
 src/Type1/t1snap.c           | 2 +-
 src/Type1/t1stdio.h          | 2 +-
 src/Type1/t1stub.c           | 2 +-
 src/Type1/t1unicode.c        | 2 +-
 src/Type1/t1unicode.h        | 2 +-
 src/Type1/token.c            | 2 +-
 src/Type1/token.h            | 2 +-
 src/Type1/tokst.h            | 2 +-
 src/Type1/trig.h             | 2 +-
 src/Type1/type1.c            | 2 +-
 src/Type1/util.c             | 2 +-
 src/Type1/util.h             | 2 +-
 src/bitmap/bdfread.c         | 2 +-
 src/bitmap/bdfutils.c        | 2 +-
 src/bitmap/bitmap.c          | 2 +-
 src/bitmap/bitmapfunc.c      | 2 +-
 src/bitmap/bitmaputil.c      | 2 +-
 src/bitmap/bitscale.c        | 2 +-
 src/bitmap/fontink.c         | 2 +-
 src/bitmap/pcfread.c         | 2 +-
 src/bitmap/pcfwrite.c        | 2 +-
 src/bitmap/snfread.c         | 2 +-
 src/bitmap/snfstr.h          | 2 +-
 src/builtins/builtin.h       | 2 +-
 src/builtins/dir.c           | 2 +-
 src/builtins/file.c          | 2 +-
 src/builtins/fonts.c         | 2 +-
 src/builtins/fpe.c           | 2 +-
 src/builtins/render.c        | 2 +-
 src/fc/fsconvert.c           | 2 +-
 src/fc/fserve.c              | 2 +-
 src/fc/fserve.h              | 2 +-
 src/fc/fservestr.h           | 2 +-
 src/fc/fsio.c                | 2 +-
 src/fc/fsio.h                | 2 +-
 src/fc/fslibos.h             | 2 +-
 src/fontcache/fontcache.c    | 2 +-
 src/fontcache/fontcache.h    | 2 +-
 src/fontfile/bitsource.c     | 2 +-
 src/fontfile/bufio.c         | 2 +-
 src/fontfile/decompress.c    | 2 +-
 src/fontfile/defaults.c      | 2 +-
 src/fontfile/dirfile.c       | 2 +-
 src/fontfile/ffcheck.c       | 2 +-
 src/fontfile/fileio.c        | 2 +-
 src/fontfile/filewr.c        | 2 +-
 src/fontfile/fontdir.c       | 2 +-
 src/fontfile/fontencc.c      | 2 +-
 src/fontfile/fontfile.c      | 2 +-
 src/fontfile/fontscale.c     | 2 +-
 src/fontfile/gunzip.c        | 2 +-
 src/fontfile/printerfont.c   | 2 +-
 src/fontfile/register.c      | 2 +-
 src/fontfile/renderers.c     | 2 +-
 src/stubs/cauthgen.c         | 2 +-
 src/stubs/csignal.c          | 2 +-
 src/stubs/delfntcid.c        | 2 +-
 src/stubs/errorf.c           | 2 +-
 src/stubs/fatalerror.c       | 2 +-
 src/stubs/findoldfnt.c       | 2 +-
 src/stubs/getcres.c          | 2 +-
 src/stubs/getdefptsize.c     | 2 +-
 src/stubs/getnewfntcid.c     | 2 +-
 src/stubs/gettime.c          | 2 +-
 src/stubs/initfshdl.c        | 2 +-
 src/stubs/regfpefunc.c       | 2 +-
 src/stubs/rmfshdl.c          | 2 +-
 src/stubs/servclient.c       | 2 +-
 src/stubs/setfntauth.c       | 2 +-
 src/stubs/stfntcfnt.c        | 2 +-
 src/stubs/stubs.h            | 2 +-
 src/stubs/xpstubs.c          | 2 +-
 src/util/atom.c              | 2 +-
 src/util/fontaccel.c         | 2 +-
 src/util/fontnames.c         | 2 +-
 src/util/fontutil.c          | 2 +-
 src/util/fontxlfd.c          | 2 +-
 src/util/format.c            | 2 +-
 src/util/miscutil.c          | 2 +-
 src/util/patcache.c          | 2 +-
 src/util/private.c           | 2 +-
 src/util/utilbitmap.c        | 2 +-
 153 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h
index d41c4a5..c389bfb 100644
--- a/include/X11/fonts/bdfint.h
+++ b/include/X11/fonts/bdfint.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.5 2001/12/14 19:56:45 dawes Exp $ */
 
 #ifndef BDFINT_H
 #define BDFINT_H
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h
index b5df964..29989e3 100644
--- a/include/X11/fonts/bitmap.h
+++ b/include/X11/fonts/bitmap.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/bitmap.h,v 1.10 2001/12/14 19:56:53 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h
index da90064..402685f 100644
--- a/include/X11/fonts/bufio.h
+++ b/include/X11/fonts/bufio.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */
+/* $XFree86: xc/lib/font/include/bufio.h,v 1.7 2001/12/14 19:56:53 dawes Exp $ */
 
 #ifndef ___BUFIO_H___
 #define ___BUFIO_H___ 1
diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h
index 80ec872..a8d9780 100644
--- a/include/X11/fonts/fntfil.h
+++ b/include/X11/fonts/fntfil.h
@@ -25,7 +25,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/font/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fntfil.h,v 1.10 2002/12/09 17:30:00 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h
index 30a95c5..1044da0 100644
--- a/include/X11/fonts/fntfilio.h
+++ b/include/X11/fonts/fntfilio.h
@@ -25,7 +25,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/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */
+/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.7 2001/12/14 19:56:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h
index c037267..8be46f2 100644
--- a/include/X11/fonts/fntfilst.h
+++ b/include/X11/fonts/fntfilst.h
@@ -25,7 +25,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/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.9 2002/12/10 22:23:52 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontencc.h b/include/X11/fonts/fontencc.h
index 51e0e14..8ed1d33 100644
--- a/include/X11/fonts/fontencc.h
+++ b/include/X11/fonts/fontencc.h
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/include/fontencc.h,v 1.1 2001/08/16 14:33:47 dawes Exp $ */
 
 /* Binary compatibility entry points. */
 
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index b7e3590..e6f2540 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -25,7 +25,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/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.17 2003/09/13 21:33:02 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontmod.h b/include/X11/fonts/fontmod.h
index 42d277f..64bf757 100644
--- a/include/X11/fonts/fontmod.h
+++ b/include/X11/fonts/fontmod.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontmod.h,v 1.3 1998/12/13 05:32:33 dawes Exp $ */
 
 #ifndef _FONTMOD_H_
 #define _FONTMOD_H_
diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h
index daa8815..7d3cfe9 100644
--- a/include/X11/fonts/fontutil.h
+++ b/include/X11/fonts/fontutil.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontutil.h,v 1.2 1999/08/21 13:48:06 dawes Exp $ */
 
 #ifndef _FONTUTIL_H_
 #define _FONTUTIL_H_
diff --git a/include/X11/fonts/fontxlfd.h b/include/X11/fonts/fontxlfd.h
index e9a12d2..49769bc 100644
--- a/include/X11/fonts/fontxlfd.h
+++ b/include/X11/fonts/fontxlfd.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.6 2001/12/14 19:56:55 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h
index 33b0cef..c627bf8 100644
--- a/include/X11/fonts/pcf.h
+++ b/include/X11/fonts/pcf.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.5 2003/11/18 01:17:04 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h
index 91c8d42..b597457 100644
--- a/src/FreeType/ft.h
+++ b/src/FreeType/ft.h
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.23 2003/10/19 18:53:49 dawes Exp $ */
 
 #ifndef _FT_H_
 #define _FT_H_
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c
index d45dc32..a3b02b9 100644
--- a/src/FreeType/ftenc.c
+++ b/src/FreeType/ftenc.c
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.24 2003/10/19 18:53:49 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.25 2003/11/20 22:36:34 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <string.h>
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 81682e4..cc6d712 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.44 2004/02/24 01:13:04 dawes Exp $ */
 
 #include "fontmisc.h"
 
diff --git a/src/FreeType/ftfuncs.h b/src/FreeType/ftfuncs.h
index 6777667..fdfd047 100644
--- a/src/FreeType/ftfuncs.h
+++ b/src/FreeType/ftfuncs.h
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.17 2003/12/21 04:02:07 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.18 2004/02/24 01:13:04 dawes Exp $ */
 
 /* Number of buckets in the hashtable holding faces */
 #define NUMFACEBUCKETS 32
diff --git a/src/FreeType/ftsystem.c b/src/FreeType/ftsystem.c
index 2378364..300ff5a 100644
--- a/src/FreeType/ftsystem.c
+++ b/src/FreeType/ftsystem.c
@@ -18,7 +18,7 @@
 /***************************************************************************/
 
 /* Modified for XFree86 */
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/FreeType/ftsystem.c,v 1.3 2002/10/01 00:02:10 alanh Exp $ */
 
   /*************************************************************************/
   /*                                                                       */
diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c
index 2cde03a..33c3e26 100644
--- a/src/FreeType/fttools.c
+++ b/src/FreeType/fttools.c
@@ -21,7 +21,7 @@
   THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */
+/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.7 2003/11/20 22:36:37 dawes Exp $ */
 
 #include "fontmisc.h"
 #ifndef FONTMODULE
diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c
index 1e2d566..b2fa8c6 100644
--- a/src/FreeType/xttcap.c
+++ b/src/FreeType/xttcap.c
@@ -30,7 +30,7 @@
 
 Notice===
  */
-/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.1 2003/10/19 18:53:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.2 2004/02/24 01:13:04 dawes Exp $ */
 
 /*
 #include "xttversion.h"
diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h
index 33c224f..2b4826b 100644
--- a/src/FreeType/xttcap.h
+++ b/src/FreeType/xttcap.h
@@ -30,7 +30,7 @@
 
 Notice===
  */
-/* $XFree86: xc/extras/X-TrueType/xttcap.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */
+/* $XFree86: xc/lib/font/FreeType/xttcap.h,v 1.1 2003/10/19 18:53:50 dawes Exp $ */
 
 #ifndef _XTTCAP_H_
 #define _XTTCAP_H_ (1)
diff --git a/src/Speedo/bics-iso.h b/src/Speedo/bics-iso.h
index 4964fa3..d3cd35b 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.6 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.7 2001/12/14 19:56:41 dawes Exp $ */
 
 int  sp_bics_map[] = {
     32, 0,
diff --git a/src/Speedo/bics-unicode.c b/src/Speedo/bics-unicode.c
index d1733cb..22eed88 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$ */
+/* $XFree86: xc/lib/font/Speedo/bics-unicode.c,v 1.1 1999/01/31 04:59:25 dawes Exp $ */
 
 /* These data are very dodgy. */
 
diff --git a/src/Speedo/bics-unicode.h b/src/Speedo/bics-unicode.h
index 90fa188..3cf2ae4 100644
--- a/src/Speedo/bics-unicode.h
+++ b/src/Speedo/bics-unicode.h
@@ -1,3 +1,3 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/Speedo/bics-unicode.h,v 1.1 1999/01/31 04:59:26 dawes Exp $ */
 
 int unicode_to_bics(unsigned);
diff --git a/src/Speedo/do_char.c b/src/Speedo/do_char.c
index c45bb5f..f28af7c 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.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */
 
 /***************************** D O - C H A R . C *****************************
  *                                                                           *
diff --git a/src/Speedo/do_trns.c b/src/Speedo/do_trns.c
index 2e397e8..25bc02a 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.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */
 
 /**************************** D O _ T R N S . C ******************************
  *                                                                           *
diff --git a/src/Speedo/out_bl2d.c b/src/Speedo/out_bl2d.c
index 61995e1..74a7310 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.3 1999/02/07 11:47:14 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.4 2001/01/17 19:43:17 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 3ecefcc..e56eb1b 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.2 1999/02/07 06:18:16 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 
 /*************************** O U T _ B L K . C *********************************
diff --git a/src/Speedo/out_scrn.c b/src/Speedo/out_scrn.c
index 8e1b48f..e17f7f6 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.4 1999/12/27 00:39:25 robin Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.5 2001/01/17 19:43:17 dawes Exp $ */
 
 
 /*************************** O U T _ S C R N . C *****************************
diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c
index a6f02f0..357763f 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.2 1999/02/07 06:18:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 
 #define	DEBUG	0
diff --git a/src/Speedo/reset.c b/src/Speedo/reset.c
index 982d644..7711951 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.2 1999/02/07 06:18:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */
 
 
 
diff --git a/src/Speedo/set_spcs.c b/src/Speedo/set_spcs.c
index df45943..14ab53e 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.3 2001/01/17 19:43:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.4 2001/08/27 19:49:50 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 18cdb46..18d87ec 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.5tsi Exp $ */
+/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.6 2003/05/27 22:26:44 tsi Exp $ */
 
 
 
diff --git a/src/Speedo/spdo_prv.h b/src/Speedo/spdo_prv.h
index 162c0fd..272ffbf 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.4 1999/03/14 03:21:17 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.5 2001/01/17 19:43:18 dawes Exp $ */
 
 
 
diff --git a/src/Speedo/speedo.h b/src/Speedo/speedo.h
index 5eb516c..a0b607f 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.5 2001/01/17 19:43:18 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.6 2001/07/25 15:04:55 dawes Exp $ */
 
 #ifndef _SPEEDO_H_
 #define _SPEEDO_H_
diff --git a/src/Speedo/spencode.c b/src/Speedo/spencode.c
index b06798c..0daccff 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.6 2001/01/17 19:43:18 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.7 2001/12/14 19:56:41 dawes Exp $ */
 
 #include	"spint.h"
 
diff --git a/src/Speedo/sperr.c b/src/Speedo/sperr.c
index 82ed532..8be42c6 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.6 2001/12/14 19:56:41 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.7 2002/05/31 18:45:48 dawes Exp $ */
 
 #include	"spint.h"
 
diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c
index ef2a764..a5c34b3 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.13 2001/08/13 21:46:47 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.14 2001/12/14 19:56:41 dawes Exp $ */
 
 #include "fntfilst.h"
 #include "fontenc.h"
diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 04d2f90..7799eef 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.12tsi Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.13 2003/05/27 22:26:44 tsi Exp $ */
 
 /*
 
diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c
index 75f779b..18204eb 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.7 2001/08/27 19:49:51 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.8 2001/12/14 19:56:42 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <X11/Xos.h>
diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c
index 979a472..6db6302 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.6 2001/01/17 19:43:20 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.7 2001/12/14 19:56:42 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 d7c9c0e..d857485 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.12 2001/12/14 19:56:42 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.13 2002/09/10 16:14:33 tsi Exp $ */
 
 #include "fntfilst.h"
 #include "fontutil.h"
diff --git a/src/Speedo/spint.h b/src/Speedo/spint.h
index 18e5203..377edd8 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.9 2001/01/17 19:43:20 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.10 2001/12/14 19:56:42 dawes Exp $ */
 
 #ifndef _SPINT_H_
 #define _SPINT_H_
diff --git a/src/Type1/afm.c b/src/Type1/afm.c
index 7df8eba..960e76f 100644
--- a/src/Type1/afm.c
+++ b/src/Type1/afm.c
@@ -15,7 +15,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/afm.c,v 1.2 1999/08/21 13:47:38 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/afm.c,v 1.3 2001/08/27 19:49:52 dawes Exp $ */
 
 #ifdef BUILDCID
 #ifndef FONTMODULE
diff --git a/src/Type1/arith.c b/src/Type1/arith.c
index c9de69f..6caaa3f 100644
--- a/src/Type1/arith.c
+++ b/src/Type1/arith.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/arith.c,v 1.6tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/arith.c,v 1.7 2003/05/27 22:26:45 tsi Exp $ */
 
  /* ARITH    CWEB         V0006 ********                             */
 /*
diff --git a/src/Type1/arith.h b/src/Type1/arith.h
index 6c810b9..0eae659 100644
--- a/src/Type1/arith.h
+++ b/src/Type1/arith.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/arith.h,v 1.4 1999/08/21 13:47:39 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/arith.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */
 
 /*SHARED*/
 
diff --git a/src/Type1/blues.h b/src/Type1/blues.h
index 88602f7..c3943ec 100644
--- a/src/Type1/blues.h
+++ b/src/Type1/blues.h
@@ -28,7 +28,7 @@
  * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/blues.h,v 1.3 1999/08/22 08:58:49 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/blues.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
 
  
 extern psobj *GetType1CharString ( psfont *fontP, unsigned char code );
diff --git a/src/Type1/cidchar.c b/src/Type1/cidchar.c
index 6699318..593337e 100644
--- a/src/Type1/cidchar.c
+++ b/src/Type1/cidchar.c
@@ -15,7 +15,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.9tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.10 2003/05/27 22:26:45 tsi Exp $ */
 
 #ifdef BUILDCID
 #ifndef FONTMODULE
diff --git a/src/Type1/curves.c b/src/Type1/curves.c
index 36336e4..206958a 100644
--- a/src/Type1/curves.c
+++ b/src/Type1/curves.c
@@ -29,7 +29,7 @@
 /* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT        */
 /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS           */
 /* SOFTWARE.                                                         */
-/* $XFree86: xc/lib/font/Type1/curves.c,v 1.7 2001/08/27 19:49:52 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/curves.c,v 1.8 2002/02/18 20:51:57 herrb Exp $ */
 
 /*
 :h1.CURVES Module - Stepping Beziers
diff --git a/src/Type1/curves.h b/src/Type1/curves.h
index ca54bad..ff2bf48 100644
--- a/src/Type1/curves.h
+++ b/src/Type1/curves.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/curves.h,v 1.3 1999/08/22 08:58:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/curves.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/fontfcn.c b/src/Type1/fontfcn.c
index 45078d7..471a4ee 100644
--- a/src/Type1/fontfcn.c
+++ b/src/Type1/fontfcn.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.10 2001/04/05 17:42:27 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.11 2001/11/23 19:21:31 dawes Exp $ */
  
 #ifndef FONTMODULE
 #include <stdio.h>
diff --git a/src/Type1/fontfcn.h b/src/Type1/fontfcn.h
index b53b4df..9383e42 100644
--- a/src/Type1/fontfcn.h
+++ b/src/Type1/fontfcn.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.4 1999/08/22 08:58:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */
 
 
 #ifdef BUILDCID
diff --git a/src/Type1/hints.c b/src/Type1/hints.c
index 691da9b..81b8a2c 100644
--- a/src/Type1/hints.c
+++ b/src/Type1/hints.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/hints.c,v 1.7tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/hints.c,v 1.8 2003/05/27 22:26:45 tsi Exp $ */
 
  /* HINTS    CWEB         V0006 ********                             */
 /*
diff --git a/src/Type1/hints.h b/src/Type1/hints.h
index 8e2ae2a..d5bb829 100644
--- a/src/Type1/hints.h
+++ b/src/Type1/hints.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/hints.h,v 1.3 1999/08/22 08:58:51 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/hints.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/lines.c b/src/Type1/lines.c
index c2b0028..197943f 100644
--- a/src/Type1/lines.c
+++ b/src/Type1/lines.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/lines.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/lines.c,v 1.5 2003/05/27 22:26:45 tsi Exp $ */
 
  /* LINES    CWEB         V0003 ********                             */
 /*
diff --git a/src/Type1/lines.h b/src/Type1/lines.h
index f8ffd3a..c0d7392 100644
--- a/src/Type1/lines.h
+++ b/src/Type1/lines.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/lines.h,v 1.3 1999/08/22 08:58:52 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/lines.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/objects.c b/src/Type1/objects.c
index e79b338..2f2d30a 100644
--- a/src/Type1/objects.c
+++ b/src/Type1/objects.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/objects.c,v 1.10tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/objects.c,v 1.11 2003/05/27 22:26:45 tsi Exp $ */
  /* OBJECTS  CWEB         V0025 ********                             */
 /*
 :h1.OBJECTS Module - TYPE1IMAGER Objects Common Routines
diff --git a/src/Type1/objects.h b/src/Type1/objects.h
index 59a22d6..e64d00e 100644
--- a/src/Type1/objects.h
+++ b/src/Type1/objects.h
@@ -43,7 +43,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/objects.h,v 1.14tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/objects.h,v 1.15 2003/05/27 22:26:45 tsi Exp $ */
 /*SHARED*/
  
 /*END SHARED*/
diff --git a/src/Type1/paths.c b/src/Type1/paths.c
index 4fa5f06..3fec84e 100644
--- a/src/Type1/paths.c
+++ b/src/Type1/paths.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/paths.c,v 1.7tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/paths.c,v 1.8 2003/05/27 22:26:46 tsi Exp $ */
 
  /* PATHS    CWEB         V0021 ********                             */
 /*
diff --git a/src/Type1/paths.h b/src/Type1/paths.h
index b61275b..3f1b389 100644
--- a/src/Type1/paths.h
+++ b/src/Type1/paths.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/paths.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/paths.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/pictures.h b/src/Type1/pictures.h
index 0abc715..aa02ce5 100644
--- a/src/Type1/pictures.h
+++ b/src/Type1/pictures.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */
 
 /* STUB */
  
diff --git a/src/Type1/regions.c b/src/Type1/regions.c
index f747c8a..e24bacc 100644
--- a/src/Type1/regions.c
+++ b/src/Type1/regions.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.c,v 3.8tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.c,v 3.9 2003/05/27 22:26:46 tsi Exp $ */
  /* REGIONS  CWEB         V0023 LOTS                                 */
 /*
 :h1 id=regions.REGIONS Module - Regions Operator Handler
diff --git a/src/Type1/regions.h b/src/Type1/regions.h
index 96ad1a5..9d27e76 100644
--- a/src/Type1/regions.h
+++ b/src/Type1/regions.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/regions.h,v 1.7 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/regions.h,v 1.8 2001/06/15 08:09:20 alanh Exp $ */
 /*SHARED*/
  
 #define   Interior(p,rule)        t1_Interior(p,rule)
diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c
index 25863f4..aa95736 100644
--- a/src/Type1/scanfont.c
+++ b/src/Type1/scanfont.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.16 2003/05/27 22:26:46 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.17 2003/11/29 04:55:28 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <string.h>
diff --git a/src/Type1/spaces.c b/src/Type1/spaces.c
index 1b2e7ae..9c79954 100644
--- a/src/Type1/spaces.c
+++ b/src/Type1/spaces.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.10tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.11 2003/05/27 22:26:47 tsi Exp $ */
  /* SPACES   CWEB         V0021 ********                             */
 /*
 :h1 id=spaces.SPACES Module - Handles Coordinate Spaces
diff --git a/src/Type1/spaces.h b/src/Type1/spaces.h
index ef78f2f..efbcecb 100644
--- a/src/Type1/spaces.h
+++ b/src/Type1/spaces.h
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.3 1999/08/22 08:58:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.4 2001/01/17 19:43:23 dawes Exp $ */
 
 /*SHARED*/
  
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index ecbd4d2..087c7e5 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -71,7 +71,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.33 2003/07/19 13:16:40 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */
 
 /*
 
diff --git a/src/Type1/t1imager.h b/src/Type1/t1imager.h
index 9730f9a..7d72495 100644
--- a/src/Type1/t1imager.h
+++ b/src/Type1/t1imager.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.5 2001/07/25 15:04:55 dawes Exp $ */
 
 
 #include "objects.h"
diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c
index f6a5012..c1ef5f6 100644
--- a/src/Type1/t1info.c
+++ b/src/Type1/t1info.c
@@ -99,7 +99,7 @@ from The Open Group.
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.18tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.19 2003/05/27 22:26:47 tsi Exp $ */
 
 #include "fntfilst.h"
 #include "fontutil.h"
diff --git a/src/Type1/t1intf.h b/src/Type1/t1intf.h
index 3a1f00b..c1e0e44 100644
--- a/src/Type1/t1intf.h
+++ b/src/Type1/t1intf.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.6 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.7 2001/07/25 15:04:55 dawes Exp $ */
 
 #ifdef BUILDCID
 #include "AFM.h"
diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c
index 0843ae1..d5ce774 100644
--- a/src/Type1/t1io.c
+++ b/src/Type1/t1io.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.8 2001/01/17 19:43:23 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */
 /*******************************************************************
 *  I/O package for Type 1 font reading
 ********************************************************************/
diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c
index 9c885a0..81ff220 100644
--- a/src/Type1/t1malloc.c
+++ b/src/Type1/t1malloc.c
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.11 2002/02/18 20:51:57 herrb Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */
  /* MALLOC   CWEB         V0004 LOTS                                 */
 /*
 :h1.MALLOC - Fast Memory Allocation
diff --git a/src/Type1/t1snap.c b/src/Type1/t1snap.c
index 96b99f2..90c396b 100644
--- a/src/Type1/t1snap.c
+++ b/src/Type1/t1snap.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
 
  
 #include "objects.h"
diff --git a/src/Type1/t1stdio.h b/src/Type1/t1stdio.h
index cc4ba9d..d4e71e8 100644
--- a/src/Type1/t1stdio.h
+++ b/src/Type1/t1stdio.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.9 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.10 2001/07/25 15:04:55 dawes Exp $ */
 /* T1IO FILE structure and related stuff */
 #ifdef XFree86LOADER
 #undef FILE
diff --git a/src/Type1/t1stub.c b/src/Type1/t1stub.c
index 2c6cfed..cfe6ea9 100644
--- a/src/Type1/t1stub.c
+++ b/src/Type1/t1stub.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.8 2001/01/17 19:43:24 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.9 2002/02/18 20:51:57 herrb Exp $ */
 
 #ifdef FONTMODULE
 #include "Xdefs.h"	/* Bool declaration */
diff --git a/src/Type1/t1unicode.c b/src/Type1/t1unicode.c
index 96f646d..c6b1cd9 100644
--- a/src/Type1/t1unicode.c
+++ b/src/Type1/t1unicode.c
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/Type1/t1unicode.c,v 1.1 1999/01/31 04:59:30 dawes Exp $ */
 
 #include "t1unicode.h"
 
diff --git a/src/Type1/t1unicode.h b/src/Type1/t1unicode.h
index bad0274..f2a13fd 100644
--- a/src/Type1/t1unicode.h
+++ b/src/Type1/t1unicode.h
@@ -20,6 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/Type1/t1unicode.h,v 1.1 1999/01/31 04:59:31 dawes Exp $ */
 
 char *unicodetoPSname(unsigned short code);
diff --git a/src/Type1/token.c b/src/Type1/token.c
index 0ec1947..6fb4109 100644
--- a/src/Type1/token.c
+++ b/src/Type1/token.c
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/token.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/token.c,v 1.6 2003/05/27 22:26:47 tsi Exp $ */
 /* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */
 #include "t1stdio.h"
 #include "util.h"
diff --git a/src/Type1/token.h b/src/Type1/token.h
index 6639828..caa2ca2 100644
--- a/src/Type1/token.h
+++ b/src/Type1/token.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/token.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/token.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
 
 #ifndef TOKEN_H
 #define TOKEN_H
diff --git a/src/Type1/tokst.h b/src/Type1/tokst.h
index 02166af..61f1ff9 100644
--- a/src/Type1/tokst.h
+++ b/src/Type1/tokst.h
@@ -27,7 +27,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */
 
 /* -------------------------------------- */
 /* --- MACHINE GENERATED, DO NOT EDIT --- */
diff --git a/src/Type1/trig.h b/src/Type1/trig.h
index d569ed0..f442a61 100644
--- a/src/Type1/trig.h
+++ b/src/Type1/trig.h
@@ -29,7 +29,7 @@
  */
 /*SHARED*/
 
-/* $XFree86: xc/lib/font/Type1/trig.h,v 1.2 1998/07/25 06:57:00 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/trig.h,v 1.3 2001/01/17 19:43:24 dawes Exp $ */
 
 #undef    DegreeCos
 #undef    DegreeSin
diff --git a/src/Type1/type1.c b/src/Type1/type1.c
index e68ee5c..9bb8d00 100644
--- a/src/Type1/type1.c
+++ b/src/Type1/type1.c
@@ -45,7 +45,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/type1.c,v 1.9tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/type1.c,v 1.10 2003/05/27 22:26:47 tsi Exp $ */
  
 /*********************************************************************/
 /*                                                                   */
diff --git a/src/Type1/util.c b/src/Type1/util.c
index 74d53fc..9bd8a83 100644
--- a/src/Type1/util.c
+++ b/src/Type1/util.c
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/util.c,v 1.5 1999/08/21 13:47:53 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/util.c,v 1.6 2001/01/17 19:43:24 dawes Exp $ */
 /* Author: Katherine A. Hitchcock    IBM Almaden Research Laboratory */
  
 #ifndef FONTMODULE
diff --git a/src/Type1/util.h b/src/Type1/util.h
index ad4ad14..7abc289 100644
--- a/src/Type1/util.h
+++ b/src/Type1/util.h
@@ -44,7 +44,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/util.h,v 1.4 1999/08/22 08:58:55 dawes Exp $ */
+/* $XFree86: xc/lib/font/Type1/util.h,v 1.5 2001/01/17 19:43:24 dawes Exp $ */
 
 #ifndef UTIL_H
 #define UTIL_H
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
index 1bcf3cb..813975a 100644
--- a/src/bitmap/bdfread.c
+++ b/src/bitmap/bdfread.c
@@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.12tsi Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.13 2003/05/27 22:26:48 tsi Exp $ */
 
 #ifndef FONTMODULE
 #include <ctype.h>
diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c
index a2641ef..c1340af 100644
--- a/src/bitmap/bdfutils.c
+++ b/src/bitmap/bdfutils.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.10 2001/12/14 19:56:45 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.11 2003/09/13 21:33:02 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <ctype.h>
diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c
index 8c37f69..6fa7bfa 100644
--- a/src/bitmap/bitmap.c
+++ b/src/bitmap/bitmap.c
@@ -25,7 +25,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/font/bitmap/bitmap.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.7 2001/12/14 19:56:45 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c
index 4312e88..da06e7d 100644
--- a/src/bitmap/bitmapfunc.c
+++ b/src/bitmap/bitmapfunc.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.17 2002/09/19 13:21:58 tsi Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.18 2002/09/24 20:48:52 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c
index 76643b8..d061fcd 100644
--- a/src/bitmap/bitmaputil.c
+++ b/src/bitmap/bitmaputil.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.11 2003/02/19 01:22:34 dawes Exp $ */
 
 #include "fntfilst.h"
 #include "bitmap.h"
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index 1af9f4f..3966c0f 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.29tsi Exp $ */
+/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.30 2003/05/27 22:26:48 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c
index c3f5e8c..45226c5 100644
--- a/src/bitmap/fontink.c
+++ b/src/bitmap/fontink.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.7 2001/12/14 19:56:46 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index ed496be..a7843cb 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.21 2003/11/17 22:20:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.22 2003/11/18 01:17:04 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c
index a55369f..c02f433 100644
--- a/src/bitmap/pcfwrite.c
+++ b/src/bitmap/pcfwrite.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.11 2003/11/17 22:20:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.12 2003/11/18 01:17:04 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c
index e40f392..848db90 100644
--- a/src/bitmap/snfread.c
+++ b/src/bitmap/snfread.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.12 2003/11/17 22:20:22 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.13 2003/11/18 01:17:04 dawes Exp $ */
 
 #ifndef FONTMODULE
 #include <ctype.h>
diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h
index 1043d50..85f75f2 100644
--- a/src/bitmap/snfstr.h
+++ b/src/bitmap/snfstr.h
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.5 2001/12/14 19:56:47 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.6 2003/11/18 01:17:04 dawes Exp $ */
 
 #ifndef SNFSTR_H
 #define SNFSTR_H 1
diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h
index f29a82c..caee81c 100644
--- a/src/builtins/builtin.h
+++ b/src/builtins/builtin.h
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */
 
 #include <X11/Xdefs.h>
 #include <font.h>
diff --git a/src/builtins/dir.c b/src/builtins/dir.c
index 52b1958..c657710 100644
--- a/src/builtins/dir.c
+++ b/src/builtins/dir.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/dir.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */
 
 #include "builtin.h"
 
diff --git a/src/builtins/file.c b/src/builtins/file.c
index b5a99bd..6fcaa79 100644
--- a/src/builtins/file.c
+++ b/src/builtins/file.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/file.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */
 
 #include "builtin.h"
 
diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c
index 6fef13f..cc7928e 100644
--- a/src/builtins/fonts.c
+++ b/src/builtins/fonts.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.4 2000/02/23 20:29:34 dawes Exp $ */
 
 #include "builtin.h"
 
diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c
index 219d998..d96fc3d 100644
--- a/src/builtins/fpe.c
+++ b/src/builtins/fpe.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */
 
 #include    "fntfilst.h"
 
diff --git a/src/builtins/render.c b/src/builtins/render.c
index 7e7180e..5f63c66 100644
--- a/src/builtins/render.c
+++ b/src/builtins/render.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
+/* $XFree86: xc/lib/font/builtins/render.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */
 
 #include    "fntfilst.h"
 #include    "builtin.h"
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c
index 84ad901..6b694fd 100644
--- a/src/fc/fsconvert.c
+++ b/src/fc/fsconvert.c
@@ -22,7 +22,7 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.15 2003/09/01 20:50:43 herrb Exp $ */
 /*
  * FS data conversion
  */
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 57b7698..07634cc 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -24,7 +24,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/font/fc/fserve.c,v 3.26tsi Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */
 
 /*
  * Copyright 1990 Network Computing Devices
diff --git a/src/fc/fserve.h b/src/fc/fserve.h
index 3254f40..9d69257 100644
--- a/src/fc/fserve.h
+++ b/src/fc/fserve.h
@@ -24,7 +24,7 @@
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  *
  */
-/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.h,v 1.5 2001/04/05 17:42:28 dawes Exp $ */
 
 #ifndef _FSERVE_H_
 #define _FSERVE_H_
diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h
index 0e41666..20c85f6 100644
--- a/src/fc/fservestr.h
+++ b/src/fc/fservestr.h
@@ -23,7 +23,7 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */
 
 #ifndef _FSERVESTR_H_
 #define _FSERVESTR_H_
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index e5c0c05..6f589c8 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -23,7 +23,7 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */
+/* $XFree86: xc/lib/font/fc/fsio.c,v 3.17 2003/05/27 22:26:49 tsi Exp $ */
 /*
  * font server i/o routines
  */
diff --git a/src/fc/fsio.h b/src/fc/fsio.h
index 2241436..974ef4a 100644
--- a/src/fc/fsio.h
+++ b/src/fc/fsio.h
@@ -23,7 +23,7 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */
+/* $XFree86: xc/lib/font/fc/fsio.h,v 1.6 2001/01/17 19:43:29 dawes Exp $ */
 
 #ifndef	_FSIO_H_
 #define	_FSIO_H_
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h
index 8d3ff55..09f1ade 100644
--- a/src/fc/fslibos.h
+++ b/src/fc/fslibos.h
@@ -31,7 +31,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */
+/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.9 2003/09/01 20:50:44 herrb Exp $ */
 
 /*
  * FSlib networking & os include file
diff --git a/src/fontcache/fontcache.c b/src/fontcache/fontcache.c
index 4d44b8f..0fec03b 100644
--- a/src/fontcache/fontcache.c
+++ b/src/fontcache/fontcache.c
@@ -26,7 +26,7 @@
  *
  *	Id: fontcache.c,v 1.19 1999/01/31 13:06:00 akiyama Exp $
  */
-/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.4 2001/04/05 17:42:28 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.5 2001/10/28 03:32:45 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/fontcache/fontcache.h b/src/fontcache/fontcache.h
index 713b314..3a10b9f 100644
--- a/src/fontcache/fontcache.h
+++ b/src/fontcache/fontcache.h
@@ -26,7 +26,7 @@
  *
  *	Id: fontcache.h,v 1.12 1999/01/09 06:24:30 akiyama Exp $
  */
-/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.6 2002/11/08 00:46:27 alanh Exp $ */
+/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.7 2003/01/26 03:02:19 dawes Exp $ */
 
 #ifndef _FONTCACHE_H_
 #define _FONTCACHE_H_
diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c
index b487ce4..0230535 100644
--- a/src/fontfile/bitsource.c
+++ b/src/fontfile/bitsource.c
@@ -25,7 +25,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/font/fontfile/bitsource.c,v 1.3 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.4 2001/12/14 19:56:49 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index 3f6d461..19d61bf 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.9 2001/12/14 19:56:50 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.10 2002/05/31 18:45:49 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index d35f5a6..187254d 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -45,7 +45,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/font/fontfile/decompress.c,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.5 2001/12/14 19:56:50 dawes Exp $ */
 /* 
  * decompress - cat a compressed file
  */
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index fb9dc81..6425d20 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -25,7 +25,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/font/fontfile/defaults.c,v 1.7 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.8 2001/12/14 19:56:50 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 688bae1..b75042a 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -25,7 +25,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/font/fontfile/dirfile.c,v 3.17 2004/02/08 01:52:27 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.18 2004/02/11 21:11:18 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
index 8a97a6e..5289b7f 100644
--- a/src/fontfile/ffcheck.c
+++ b/src/fontfile/ffcheck.c
@@ -25,7 +25,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/font/fontfile/ffcheck.c,v 1.15tsi Exp $ */
+/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.16 2003/05/27 22:26:49 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index cdcc853..8a7cb03 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -25,7 +25,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/font/fontfile/fileio.c,v 3.9 2001/12/14 19:56:51 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.10 2002/05/31 18:45:50 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index 5deb1a5..8de8f26 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -25,7 +25,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/font/fontfile/filewr.c,v 3.6 2001/12/14 19:56:51 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.7 2002/05/31 18:45:50 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 883822d..b558c70 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -25,7 +25,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/font/fontfile/fontdir.c,v 3.22 2003/07/07 16:40:11 eich Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.23 2003/12/02 19:50:40 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index cc77748..2c8bdbd 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.1 2001/08/13 21:46:47 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.2 2001/08/16 14:33:46 dawes Exp $ */
 
 /* Binary compatibility code. */
 
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 6213768..22f844f 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -25,7 +25,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/font/fontfile/fontfile.c,v 3.21 2003/12/02 19:50:40 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.22 2004/02/11 21:11:20 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c
index 3b7443f..8fb63e4 100644
--- a/src/fontfile/fontscale.c
+++ b/src/fontfile/fontscale.c
@@ -25,7 +25,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/font/fontfile/fontscale.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.10 2001/12/14 19:56:52 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c
index bf737a8..21894d0 100644
--- a/src/fontfile/gunzip.c
+++ b/src/fontfile/gunzip.c
@@ -2,7 +2,7 @@
 /* lib/font/fontfile/gunzip.c
    written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996.
    intended for inclusion in X11 public releases. */
-/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */
+/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.5 2001/01/17 19:43:30 dawes Exp $ */
 
 #include "fontmisc.h"
 #include <bufio.h>
diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
index d241d1b..112b1bc 100644
--- a/src/fontfile/printerfont.c
+++ b/src/fontfile/printerfont.c
@@ -25,7 +25,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/font/fontfile/printerfont.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.6 2003/05/27 22:26:49 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/fontfile/register.c b/src/fontfile/register.c
index 4bc7b8a..385d165 100644
--- a/src/fontfile/register.c
+++ b/src/fontfile/register.c
@@ -25,7 +25,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/font/fontfile/register.c,v 1.14 2001/01/17 19:43:30 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/register.c,v 1.15 2001/12/14 19:56:52 dawes Exp $ */
 
 /*
  * This is in a separate source file so that small programs
diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c
index 7d11d3e..0230e09 100644
--- a/src/fontfile/renderers.c
+++ b/src/fontfile/renderers.c
@@ -25,7 +25,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/font/fontfile/renderers.c,v 1.7 2002/12/09 17:30:00 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.8 2004/01/06 16:28:21 martin Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/stubs/cauthgen.c b/src/stubs/cauthgen.c
index 690416e..b40a440 100644
--- a/src/stubs/cauthgen.c
+++ b/src/stubs/cauthgen.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/cauthgen.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/csignal.c b/src/stubs/csignal.c
index a2919f7..668f4f5 100644
--- a/src/stubs/csignal.c
+++ b/src/stubs/csignal.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/csignal.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/delfntcid.c b/src/stubs/delfntcid.c
index 7e9276a..a9aaf35 100644
--- a/src/stubs/delfntcid.c
+++ b/src/stubs/delfntcid.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/delfntcid.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/errorf.c b/src/stubs/errorf.c
index f54868d..7fdd1d5 100644
--- a/src/stubs/errorf.c
+++ b/src/stubs/errorf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/fatalerror.c b/src/stubs/fatalerror.c
index 4b01cbd..dbbfdd4 100644
--- a/src/stubs/fatalerror.c
+++ b/src/stubs/fatalerror.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/findoldfnt.c b/src/stubs/findoldfnt.c
index 1b26797..ce8a9de 100644
--- a/src/stubs/findoldfnt.c
+++ b/src/stubs/findoldfnt.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/findoldfnt.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/getcres.c b/src/stubs/getcres.c
index e08ec48..e1ce577 100644
--- a/src/stubs/getcres.c
+++ b/src/stubs/getcres.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/getcres.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/getdefptsize.c b/src/stubs/getdefptsize.c
index b55a408..ada6c6a 100644
--- a/src/stubs/getdefptsize.c
+++ b/src/stubs/getdefptsize.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/getdefptsize.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/getnewfntcid.c b/src/stubs/getnewfntcid.c
index 7253d21..a65fd27 100644
--- a/src/stubs/getnewfntcid.c
+++ b/src/stubs/getnewfntcid.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/getnewfntcid.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/gettime.c b/src/stubs/gettime.c
index c92a980..023441f 100644
--- a/src/stubs/gettime.c
+++ b/src/stubs/gettime.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/gettime.c,v 1.1 1999/12/15 01:14:36 robin Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/initfshdl.c b/src/stubs/initfshdl.c
index e7fffb0..7a7f024 100644
--- a/src/stubs/initfshdl.c
+++ b/src/stubs/initfshdl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/regfpefunc.c b/src/stubs/regfpefunc.c
index 0c6741a..96f4b92 100644
--- a/src/stubs/regfpefunc.c
+++ b/src/stubs/regfpefunc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.2 1999/08/21 13:48:07 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/rmfshdl.c b/src/stubs/rmfshdl.c
index bb50ea1..1c6f650 100644
--- a/src/stubs/rmfshdl.c
+++ b/src/stubs/rmfshdl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.2 2003/09/13 21:33:03 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/servclient.c b/src/stubs/servclient.c
index 25c853f..7f3e786 100644
--- a/src/stubs/servclient.c
+++ b/src/stubs/servclient.c
@@ -1,3 +1,3 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/servclient.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
 
 void *serverClient = 0;
diff --git a/src/stubs/setfntauth.c b/src/stubs/setfntauth.c
index b0eb94e..75e59c4 100644
--- a/src/stubs/setfntauth.c
+++ b/src/stubs/setfntauth.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/setfntauth.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/stfntcfnt.c b/src/stubs/stfntcfnt.c
index 7cfa12d..cbb544f 100644
--- a/src/stubs/stfntcfnt.c
+++ b/src/stubs/stfntcfnt.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/stfntcfnt.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
 
 #include "stubs.h"
 
diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
index fe8ddd1..097b60c 100644
--- a/src/stubs/stubs.h
+++ b/src/stubs/stubs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */
+/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.4 2003/09/13 21:33:03 dawes Exp $ */
 
 /* This directory includes dummy entry for bdftopcf and mkfontdir */
 
diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c
index 5ac9117..c692bbc 100644
--- a/src/stubs/xpstubs.c
+++ b/src/stubs/xpstubs.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/font/stubs/xpstubs.c,v 1.1 1999/01/11 05:13:22 dawes Exp $ */
 
 /*
   stub for XpClient* functions.
diff --git a/src/util/atom.c b/src/util/atom.c
index 36a2f44..3863c94 100644
--- a/src/util/atom.c
+++ b/src/util/atom.c
@@ -25,7 +25,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/font/util/atom.c,v 1.9 2002/09/19 13:22:00 tsi Exp $ */
+/* $XFree86: xc/lib/font/util/atom.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c
index 3dd2492..f922145 100644
--- a/src/util/fontaccel.c
+++ b/src/util/fontaccel.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.7 2001/12/14 19:56:56 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/fontnames.c b/src/util/fontnames.c
index 130589f..cbd355a 100644
--- a/src/util/fontnames.c
+++ b/src/util/fontnames.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontnames.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/fontnames.c,v 1.5 2001/12/14 19:56:56 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/fontutil.c b/src/util/fontutil.c
index daf65e4..3bd5e51 100644
--- a/src/util/fontutil.c
+++ b/src/util/fontutil.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontutil.c,v 3.6 2001/10/28 03:32:46 tsi Exp $ */
+/* $XFree86: xc/lib/font/util/fontutil.c,v 3.7 2001/12/14 19:56:56 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 257d558..593f84c 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.16tsi Exp $ */
+/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.17 2003/10/24 16:11:52 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/format.c b/src/util/format.c
index 596e6eb..c406009 100644
--- a/src/util/format.c
+++ b/src/util/format.c
@@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/format.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */
 
 #include	"FSproto.h"
 #include	"font.h"
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 2d4e973..484e387 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/miscutil.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/miscutil.c,v 1.8 2001/12/14 19:56:57 dawes Exp $ */
 
 #include <X11/Xosdefs.h>
 #include <stdlib.h>
diff --git a/src/util/patcache.c b/src/util/patcache.c
index 37d0281..7b31016 100644
--- a/src/util/patcache.c
+++ b/src/util/patcache.c
@@ -25,7 +25,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/font/util/patcache.c,v 3.4 2001/01/17 19:43:33 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/patcache.c,v 3.5 2001/12/14 19:56:57 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/private.c b/src/util/private.c
index d902484..729d41a 100644
--- a/src/util/private.c
+++ b/src/util/private.c
@@ -25,7 +25,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/font/util/private.c,v 1.8tsi Exp $ */
+/* $XFree86: xc/lib/font/util/private.c,v 1.9 2003/02/27 22:19:20 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index bd7c2cd..c407f29 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -25,7 +25,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/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
+/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
-- 
cgit v1.2.3