xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

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

New commits:
commit b5f1b211b4bbbf4049b422b0e08e02efaaf7a26a
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Dec 17 12:39:36 2024 -0500

    xserver 21.1.15
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1753>

diff --git a/configure.ac b/configure.ac
index 80c603719..a5c426a84 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.14, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2024-10-29"
+AC_INIT([xorg-server], 21.1.15, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2024-12-17"
 RELEASE_NAME="Caramel Ice Cream"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/meson.build b/meson.build
index f022a7aa4..0077149cd 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '21.1.14',
+        version: '21.1.15',
         meson_version: '>= 0.47.0',
 )
-release_date = '2024-10-29'
+release_date = '2024-12-17'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')