xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xquartz/bundle/Info.plist.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95bf478b78e466002c382bcde7d4d62591e9215d
Merge: abf5d5a bb745f2
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Oct 31 18:18:19 2013 -0700

    Merge remote-tracking branch 'jeremyhu/master'

commit bb745f2b45768d0936f3960951e1a5cee8b03194
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Oct 31 08:50:57 2013 -0700

    XQuartz: Bump bundle version to 2.7.6
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index b0106c6..b99e417 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.7.4</string>
+		<string>2.7.6</string>
 	<key>CFBundleVersion</key>
-		<string>2.7.4</string>
+		<string>2.7.6</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>