xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    6 +++---
 meson.build  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d61e516c847b9ff7e89e6be269050032070c1ad3
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 10 15:45:02 2018 -0400

    xserver 1.20 RC4
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index d8d88e2b1..72dd59a62 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.19.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2018-04-02"
-RELEASE_NAME="Tortilla Soup"
+AC_INIT([xorg-server], 1.19.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2018-04-10"
+RELEASE_NAME="Stuffed Morel"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/meson.build b/meson.build
index 277534093..e2dad87bb 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.19.99.903',
+        version: '1.19.99.904',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')