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

[Jeremy Huddleston]

 hw/xquartz/mach-startup/stub.c |    2 +-
 hw/xquartz/xpr/xprScreen.c     |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c83f701aa75c75433b8745f5d79bca3a7516df91
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 15:21:12 2009 -0700

    XQuartz: Bump the reported version to X11R7.4

diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 7eb894c..cee8116 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -222,7 +222,7 @@ int main(int argc, char **argv, char **envp) {
     sig_t handler;
 
     if(argc == 2 && !strcmp(argv[1], "-version")) {
-        fprintf(stderr, "X.org Release 7.3\n");
+        fprintf(stderr, "X.org Release 7.4\n");
         fprintf(stderr, "X.Org X Server %s\n", XSERVER_VERSION);
         fprintf(stderr, "Build Date: %s\n", BUILD_DATE);
         return EXIT_SUCCESS;
commit 75e104730810acbb11bf8503bac24ea25243b2ac
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 10:39:26 2009 -0700

    XQuartz: xpr: Added missing include for RootlessHideAllWindows

diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 1fac9ec..9a2b1b4 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -48,6 +48,8 @@
 #include "applewmExt.h"
 #include "micmap.h"
 
+#include "rootlessCommon.h"
+
 #ifdef DAMAGE
 # include "damage.h"
 #endif