xserver: Branch 'master'

[Alan Coopersmith]

 mi/miinitext.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree bb3aa94845a74d7718ba9539bb76203ec82957fc (from 10f3e32726d5b4981abd1a3a022e5b4f219fb41e)
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Jul 11 18:26:55 2006 -0700

    Bug #7346: Disable Composite extension in Xprt
    
    Xorg Bug #7346 <https://bugs.freedesktop.org/show_bug.cgi?id=7346>
    Patch #6184 <https://bugs.freedesktop.org/attachment.cgi?id=6184>

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 51faac9..2c1b1e2 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -108,6 +108,7 @@ SOFTWARE.
 #undef XF86DRI
 #undef DPMSExtension
 #undef FONTCACHE
+#undef COMPOSITE
 #undef DAMAGE
 #undef XFIXES
 #undef XEVIE