frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last of the spam... I promise... 

(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
This commit is contained in:
Jeremy Huddleston 2008-04-18 20:30:43 -07:00
parent 49f2bb4681
commit ed9dabb47c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/X11Application.m
View File

@ -34,7 +34,7 @@
#endif #endif
#include "quartzForeground.h" #include "quartzForeground.h"
#include "quartzCommon.h"
#import "X11Application.h" #import "X11Application.h"
# include "darwin.h" # include "darwin.h"
@ -43,10 +43,6 @@
# define _APPLEWM_SERVER_ # define _APPLEWM_SERVER_
# include "X11/extensions/applewm.h" # include "X11/extensions/applewm.h"
# include "micmap.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 <mach/mach.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>