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

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

(limited to 'bitmaps.h')

diff --git a/bitmaps.h b/bitmaps.h
index de5806d..5ffb431 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************************/
-/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.4 2001/01/17 23:45:11 dawes Exp $ */
+/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */
 
 /* Set fill style (if any) to a bitmap or tile */
 
-- 
cgit v1.2.3