xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 3c1fc8de955aeb12c3cf4a061fcd59cd6473ea13
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 16 10:03:49 2016 -0700

    Bump version to 1.18.99.2
    
    Prepare for 1.19 RC1
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 4b2b4f6..190e473 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.18.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-11-09"
-RELEASE_NAME="Ouzo"
+AC_INIT([xorg-server], 1.18.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-09-16"
+RELEASE_NAME="Marionberry Pie"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])