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/fontfile/fontfile.c | |
| parent | 8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/fontfile/fontfile.c')
| -rw-r--r-- | src/fontfile/fontfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c index 22f844f..d32c4a1 100644 --- a/src/fontfile/fontfile.c +++ b/src/fontfile/fontfile.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ /* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* @@ -25,7 +26,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.22 2004/02/11 21:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.21 2003/12/02 19:50:40 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium |