summaryrefslogtreecommitdiff
path: root/src/FreeType
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-14 08:32:37 +0000
committerEgbert Eich <eich@suse.de>2004-03-14 08:32:37 +0000
commit8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (patch)
treebbfcc6d332dd2a777a57ab804d544bf04f0fafcf /src/FreeType
parent4986cabb22d133aeb37b53514471ff7d5bf999fe (diff)
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1
Diffstat (limited to 'src/FreeType')
-rw-r--r--src/FreeType/ft.h2
-rw-r--r--src/FreeType/ftenc.c2
-rw-r--r--src/FreeType/ftfuncs.c2
-rw-r--r--src/FreeType/ftfuncs.h2
-rw-r--r--src/FreeType/ftsystem.c2
-rw-r--r--src/FreeType/fttools.c2
-rw-r--r--src/FreeType/xttcap.c2
-rw-r--r--src/FreeType/xttcap.h2
8 files changed, 8 insertions, 8 deletions
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)