From f8419f84622bf0b65e1ed62c1828d041613a3e01 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:43:08 +0000
Subject: Merging XORG-CURRENT into trunk

---
 fontproto.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fontproto.h')

diff --git a/fontproto.h b/fontproto.h
index e30cae1..83c9a00 100644
--- a/fontproto.h
+++ b/fontproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.3 2001/04/05 17:42:26 dawes Exp $ */
+/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
 
 /***********************************************************
 
-- 
cgit v1.2.1