xserver: Branch 'master' - 2 commits

[Keith Packard]

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

New commits:
commit 98cde254acb9b98337ddecf64c138d38c14ec2bf
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Dec 27 13:42:21 2011 -0800

    Bump version to 1.11.99.901 (1.12 RC1)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 261af5f..6de92b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.11.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-12-17"
+AC_INIT([xorg-server], 1.11.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-12-27"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 5037c9af78da6652189de7202e70e1b833395af5
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Dec 27 14:02:01 2011 -0800

    glx/glapioffsets.h is no longer part of the build, remove it
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/Makefile.am b/glx/Makefile.am
index f61a408..ced78b7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -43,7 +43,6 @@ glapi_sources =					\
 	glapi.c					\
 	glapi.h					\
 	glapi_gentable.c			\
-	glapioffsets.h				\
 	glprocs.h				\
 	glthread.c				\
 	glthread.h