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

---
 src/FreeType/ft.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/FreeType/ft.h')

diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h
index b597457..91c8d42 100644
--- a/src/FreeType/ft.h
+++ b/src/FreeType/ft.h
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.23 2003/10/19 18:53:49 dawes Exp $ */
+/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */
 
 #ifndef _FT_H_
 #define _FT_H_
-- 
cgit v1.2.3