summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2021-07-08 12:15:21 -0700
committerMatt Turner <mattst88@gmail.com>2021-07-08 12:15:21 -0700
commitb88ad0b342c954109bfd4b1d32c04ff55545cb0f (patch)
tree853644cd01ecf12ce79c9a2b8d8ce40a85512e14
parent8dea50223b9b9495aa2e2f4e6aef2a842c0e0a2f (diff)
xserver 1.20.12xorg-server-1.20.12
Signed-off-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--configure.ac6
-rw-r--r--meson.build2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index a166d83f7..ae4443748 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.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2021-04-13"
-RELEASE_NAME="Arroz con Pollo"
+AC_INIT([xorg-server], 1.20.12, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-07-08"
+RELEASE_NAME="Lemon Pepper Chicken"
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 b3ef00b68..c74135aff 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.11',
+ version: '1.20.12',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')