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/fc/fserve.c | |
parent | 8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/fc/fserve.c')
-rw-r--r-- | src/fc/fserve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fc/fserve.c b/src/fc/fserve.c index 07634cc..85a4214 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.1.4.3 2003/12/06 13:24:22 kaleb Exp $ */ /* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* @@ -24,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/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26tsi Exp $ */ /* * Copyright 1990 Network Computing Devices |