xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 mi/miexpose.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0367d792b46c8a0852f51440c72ba6002aa7ea2
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Sep 27 23:41:24 2009 -0700

    Rootless: Correct border rendering on parent-relative windows
    
    Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
    (cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e)

diff --git a/mi/miexpose.c b/mi/miexpose.c
index d540a9f..9043254 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -537,7 +537,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
 void RootlessStartDrawing(WindowPtr pWin);
 void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
 Bool IsFramedWindow(WindowPtr pWin);
-#endif
+#endif 
 
 _X_EXPORT void
 miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)