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

[Ben Byer]

 configure.ac                     |    2 +-
 hw/darwin/apple/X11Application.m |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f9859dc0b08be61fe37973b9aeda70b86ea2511
Author: Ben Byer <bbyer at bbyer.local>
Date:   Sat Nov 3 22:06:39 2007 -0700

    bump version to 1.2a5

diff --git a/configure.ac b/configure.ac
index cfa7614..76938ab 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.2a4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2a5, [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/darwin/apple/X11Application.m b/hw/darwin/apple/X11Application.m
index 9dba46c..a8ba95f 100644
--- a/hw/darwin/apple/X11Application.m
+++ b/hw/darwin/apple/X11Application.m
@@ -156,7 +156,7 @@ message_kit_thread (SEL selector, NSObject *arg)
 	
     tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
 	
-    [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2 (xorg-server-1.2a4)",
+    [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2 (xorg-server-1.2a5)",
 					 tem] forKey:@"ApplicationVersion"];
 	
     [self orderFrontStandardAboutPanelWithOptions: dict];