xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

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

New commits:
commit 27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Oct 27 13:36:45 2021 +0300

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

diff --git a/configure.ac b/configure.ac
index 4dcf46c4b..af8d5d582 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.902, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2021-10-14"
-RELEASE_NAME="Cheesecake"
+AC_INIT([xorg-server], 21.1.0, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-10-27"
+RELEASE_NAME="Caramel Ice Cream"
 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 7e4b08314..55f4deb15 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '21.0.99.902',
+        version: '21.1.0',
         meson_version: '>= 0.47.0',
 )
-release_date = '2021-10-14'
+release_date = '2021-10-27'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')