xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit b4f55712da4d7294bfeb6cffc45b572fd999d800
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Mon Jul 5 21:40:55 2021 +0300

    xserver 21.0.99.1
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/configure.ac b/configure.ac
index 10900db14..cf3da5338 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], 20.99.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2018-05-14"
+AC_INIT([xorg-server], 21.0.99.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-07-05"
 RELEASE_NAME="Carrot and Ginger Soup"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/meson.build b/meson.build
index be59e91b8..24a3840e0 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '20.99.1',
+        version: '21.0.99.1',
         meson_version: '>= 0.47.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])