xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

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

New commits:
commit d00e7dfc9da165810a578fa0910475686e1fa51c
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Tue Sep 21 23:35:42 2021 +0300

    xserver 21.1 RC 1
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/configure.ac b/configure.ac
index 124aea331..780698e9f 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], 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_INIT([xorg-server], 21.0.99.901, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-09-21"
+RELEASE_NAME="Cheesecake"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-xz])
diff --git a/meson.build b/meson.build
index b55ee696a..326cc5090 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '21.0.99.1',
+        version: '21.0.99.901',
         meson_version: '>= 0.47.0',
 )
-release_date = '2021-07-05'
+release_date = '2021-09-21'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')