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

---
 hw/xwin/winmultiwindowshape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hw/xwin/winmultiwindowshape.c')

diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 2d6a6f2cc..a21bbe9f3 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -28,7 +28,7 @@
  * Authors:	Kensuke Matsuzaki
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
 
 #ifdef SHAPE
 
-- 
cgit v1.2.3