xserver: Branch 'server-1.2-branch' - 2 commits

[Adam Jackson]

 configure.ac                            |    6 +++---
 hw/xfree86/os-support/linux/Makefile.am |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
diff-tree 07b99b324301675ecd2f999752141238b24de022 (from 07c437e19536e661116f59d4ed54d7eafddb79f2)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Mon Nov 13 13:57:42 2006 -0500

    configure.ac bump.

diff --git a/configure.ac b/configure.ac
index 25a35b7..9820c65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
 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.1.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.1.99.902, [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
@@ -298,8 +298,8 @@ DEFAULT_VENDOR_NAME_SHORT="X.Org"
 DEFAULT_VERSION_MAJOR=7
 DEFAULT_VERSION_MINOR=1
 DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=2
-DEFAULT_RELEASE_DATE="21 December 2005"
+DEFAULT_VERSION_SNAP=902
+DEFAULT_RELEASE_DATE="13 November 2006"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
diff-tree 07c437e19536e661116f59d4ed54d7eafddb79f2 (from d17becf0242c0e5ef0f10c0718e21f773fa5069f)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Mon Nov 13 13:54:19 2006 -0500

    Include a forgotten ia64 header in the distball.  Builds on ia64 now.

diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 7f71022..2be5a89 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -50,4 +50,5 @@ EXTRA_DIST = \
 	$(LNX_EXTRA_SOURCES) \
 	lnx.h \
 	lnx_kbd.h \
-	$(srcdir)/../shared/xf86Axp.h
+	$(srcdir)/../shared/xf86Axp.h \
+	$(srcdir)/../shared/ia64Pci.h