xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac        |    5 +++--
 include/Makefile.am |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c22c936b35cee60609041ccb7ee52c00b0634d7b
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Aug 7 16:04:25 2012 -0700

    Release 1.12.99.904
    
    Closing the non-critical bug window for 1.13
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index d13df38..e126355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-07-25"
+AC_INIT([xorg-server], 1.12.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-08-07"
+RELEASE_NAME="Sweating Aardvark"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit f94ec283efc922106e7ea1d85771950c66ee8f3b
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Aug 7 16:18:21 2012 -0700

    Distribute include/glx_extinit.h
    
    This changed should have been in aad428b8e21c77397c623b78706eb64b1fea77c9
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 972f403..33116f2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -26,6 +26,7 @@ sdk_HEADERS =		\
 	gc.h		\
 	gcstruct.h	\
 	globals.h	\
+	glx_extinit.h	\
 	input.h		\
 	inputstr.h	\
 	list.h		\