diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:44:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:44:23 +0000 |
commit | 3d75ea33ecf80c3539b38a993092cd16325a9525 (patch) | |
tree | 2c833d7262e8c8e52b052930b7cef9053abf1943 /src/Type1/scanfont.c | |
parent | 8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/Type1/scanfont.c')
-rw-r--r-- | src/Type1/scanfont.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c index aa95736..64f7473 100644 --- a/src/Type1/scanfont.c +++ b/src/Type1/scanfont.c @@ -1,3 +1,4 @@ +/* $XdotOrg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ /* $Xorg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved @@ -45,7 +46,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.17 2003/11/29 04:55:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.16 2003/05/27 22:26:46 tsi Exp $ */ #ifndef FONTMODULE #include <string.h> |