xserver: Branch 'master'

[Keith Packard]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a615b90cab7569fae9d123e4da1d3373c871d84b
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Mar 14 11:32:36 2012 -0700

    Bump version number to 1.12.99.0
    
    Now that 1.12 has branched, reset the version on master to a
    development number.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 2693ce7..65d29f2 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.12.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-03-04"
+AC_INIT([xorg-server], 1.12.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-03-14"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE