xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

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

New commits:
commit 6b767cdf6574081164aa6c6a7b617cda579b84c6
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Apr 13 10:01:34 2021 -0400

    xserver 1.20.11
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 41c87a8d1..7ba6d05ba 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], 1.20.10, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2020-12-01"
-RELEASE_NAME="Chicken Pot Pie"
+AC_INIT([xorg-server], 1.20.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-04-13"
+RELEASE_NAME="Arroz con Pollo"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/meson.build b/meson.build
index df2ba3663..b3ef00b68 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.20.10',
+        version: '1.20.11',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')