xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ed9dabb47c467dbf49836b631d5d6bda4b0d98b0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Apr 18 20:30:43 2008 -0700

    Last of the spam... I promise...
    (cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 90a0005..3df19de 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -34,7 +34,7 @@
 #endif
 
 #include "quartzForeground.h"
-
+#include "quartzCommon.h"
 #import "X11Application.h"
 
 # include "darwin.h"
@@ -43,10 +43,6 @@
 # define _APPLEWM_SERVER_
 # include "X11/extensions/applewm.h"
 # include "micmap.h"
-<<<<<<< HEAD:hw/xquartz/X11Application.m
-=======
-
->>>>>>> bc50d41... XQuartz: More sanitization of the namespace:hw/xquartz/X11Application.m
 #include <mach/mach.h>
 #include <unistd.h>
 #include <pthread.h>