xserver: Branch 'master' - 2 commits

[Keith Packard]

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

New commits:
commit 5952efa903d57ac69070f1477ce46223a2a7893c
Author: Keith Packard <keithp at keithp.com>
Date:   Sun Nov 20 13:07:33 2011 -0800

    Bump version to 1.11.99.1 (1.12 development release 1)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 63d59f9..e804030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.11.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-08-26"
+AC_INIT([xorg-server], 1.11.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-11-20"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 795fbe3e6e440f023e52c452106f4c266c13d36c
Author: Keith Packard <keithp at keithp.com>
Date:   Sun Nov 20 13:33:12 2011 -0800

    Add 'optionstr.h' to include/Makefile.am
    
    This makes sure it gets distributed
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 6f63c76..972f403 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -32,6 +32,7 @@ sdk_HEADERS =		\
 	misc.h		\
 	miscstruct.h	\
 	opaque.h	\
+	optionstr.h	\
 	os.h		\
 	pixmap.h	\
 	pixmapstr.h	\