From 9b6257bdb5461131e42a3d81330c76d7a2bc670a Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:31 +0000
Subject: Merging XORG-CURRENT into trunk

---
 Bitmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Bitmap.c')

diff --git a/Bitmap.c b/Bitmap.c
index 43eacb2..669187c 100644
--- a/Bitmap.c
+++ b/Bitmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.6 2002/02/18 21:43:17 herrb Exp $ */
+/* $XFree86: Bitmap.c,v 1.5 2001/12/26 21:39:34 paulo Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
-- 
cgit v1.2.3