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

---
 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 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/bitmap')

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
-- 
cgit v1.2.3