xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

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

New commits:
commit 9852b29380673484aea25771a3e812c8e8a40393
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Dec 15 15:46:09 2021 +0200

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

diff --git a/configure.ac b/configure.ac
index 3045f108a..9ecba6875 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], 21.1.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2021-11-07"
+AC_INIT([xorg-server], 21.1.2, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-12-15"
 RELEASE_NAME="Caramel Ice Cream"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/meson.build b/meson.build
index 3a35f0ee9..17dcba3cc 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '21.1.1',
+        version: '21.1.2',
         meson_version: '>= 0.47.0',
 )
-release_date = '2021-11-07'
+release_date = '2021-12-15'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')