xserver: Branch 'xorg-server-1.2-apple'

[Jeremy Huddleston]

 configure.ac                 |    2 +-
 hw/xquartz/bundle/Info.plist |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c0e889bb5827400df2208b0341acea40cdd613b0
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sun Jan 6 20:10:52 2008 -0800

    XQuartz: Marked 1.3.0-apple6 and X11.app 2.1.2

diff --git a/configure.ac b/configure.ac
index 7e7aac6..2e38aa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.0-apple5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.0-apple6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index 59c8176..9b030df 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.1.1</string>
+		<string>2.1.2</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>