From f8419f84622bf0b65e1ed62c1828d041613a3e01 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:08 +0000 Subject: Merging XORG-CURRENT into trunk --- FSproto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'FSproto.h') diff --git a/FSproto.h b/FSproto.h index 14c4582..03b2808 100644 --- a/FSproto.h +++ b/FSproto.h @@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/include/fonts/FSproto.h,v 1.3 2001/12/14 19:53:31 dawes Exp $ */ +/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */ #ifndef _FS_PROTO_H_ #define _FS_PROTO_H_ -- cgit v1.2.1