From 1d9c96a7d7e79c9dd47b9ee210ad9e0c834356c5 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:26:30 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 xf86bigfont.h | 2 +-
 xf86bigfstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86bigfont.h b/xf86bigfont.h
index 7d6d163..9c47996 100644
--- a/xf86bigfont.h
+++ b/xf86bigfont.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */
 /*
  * Declarations for the BIGFONT extension.
  *
diff --git a/xf86bigfstr.h b/xf86bigfstr.h
index 9fce90b..7ba199b 100644
--- a/xf86bigfstr.h
+++ b/xf86bigfstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */
 /*
  * Declarations of request structures for the BIGFONT extension.
  *
-- 
cgit v1.2.1