xserver: Branch 'master'

[Keith Packard]

 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2b539239e465faa9e8c6d96f1c6f00e593d46c18
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Apr 24 10:11:03 2013 -0700

    Bump to 1.14.99.1
    
    Snapshot with fix for CVE-2013-1940.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index e0750bb..0b72860 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-03-18"
-RELEASE_NAME="Pok Pok Meyer Lemon"
+AC_INIT([xorg-server], 1.14.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-04-24"
+RELEASE_NAME="Sweet Tea"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])