xserver: Branch 'master'

[Ben Byer]

 hw/darwin/darwin.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 8b77dc7e808f61f1ed10fe05cf898bb47459a76d (from 20c6677d1b5f8d77325dd878ffa3df1d0fb01864)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 14:48:38 2007 -0700

    XDARWIN: build breakage fix

diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index 7b48368..4e34954 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -156,7 +156,7 @@ DarwinPrintBanner()
 #endif
   ErrorF("\nRelease Date: %s\n", XF86_DATE);
   ErrorF("X Protocol Version %d, Revision %d, %s\n",
-         X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE );
+         X_PROTOCOL, X_PROTOCOL_REVISION, XORG_VERSION_CURRENT );
   ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR);
 #ifdef HAS_UTSNAME
   {