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

---
 fb/fbimage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fb/fbimage.c')

diff --git a/fb/fbimage.c b/fb/fbimage.c
index 7d0284c38..49356f627 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */
 
 #include "fb.h"
 #ifdef XFree86LOADER
-- 
cgit v1.2.3