From 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 13 Nov 2013 08:07:38 +0100
Subject: mesa xserver pixman git update 9 nov 2013

xserver          commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman           commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa             commit e0489531455623aa21aa565b2c890362d8437f23
---
 xorg-server/hw/xquartz/X11Controller.m       | 2 +-
 xorg-server/hw/xquartz/bundle/Info.plist.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'xorg-server/hw/xquartz')

diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m
index 737db42e7..3d094bfc7 100644
--- a/xorg-server/hw/xquartz/X11Controller.m
+++ b/xorg-server/hw/xquartz/X11Controller.m
@@ -936,7 +936,7 @@ extern char *bundle_id_prefix;
 
 - (void) applicationWillTerminate:(NSNotification *)aNotification
 {
-    unsigned remain;
+    int remain;
     [X11App prefs_synchronize];
 
     /* shutdown the X server, it will exit () for us. */
diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
index b99e417aa..5fbb0ad55 100644
--- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp
+++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
@@ -39,9 +39,9 @@
 	<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>
-		<string>© 2003-2012 Apple Inc.
+		<string>© 2003-2013 Apple Inc.
 © 2003 XFree86 Project, Inc.
-© 2003-2012 X.org Foundation, Inc.
+© 2003-2013 X.org Foundation, Inc.
 </string>
 	<key>NSMainNibFile</key>
 		<string>main</string>
-- 
cgit v1.2.3