From 9231a3312bb099559fb6902f8641a4f331fc4ce5 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:18 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 files.     Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
     future conflicts on ASCII but not humal readable files. (There should    
 probably be separate CreditsXorg.rtf files) (Egbert Eich).

---
 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