summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2019-11-22 17:52:04 -0500
committerMatt Turner <mattst88@gmail.com>2019-11-22 17:56:38 -0500
commit6b3fafa9bfa94b9b04a1a44dc52afb7c4bc250ce (patch)
tree81c36cd2dc54dcfa8966597c17bd6b450f3a8bbe
parent88f12aa74bf4fea25d5b8d8002b3088432feb405 (diff)
xserver 1.20.6xorg-server-1.20.6
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 6033cb404..a58954f89 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.5, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2019-05-30"
-RELEASE_NAME="Red Lentil Dal"
+AC_INIT([xorg-server], 1.20.6, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2019-11-22"
+RELEASE_NAME="Enchiladas de Queso"
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 492142850..31adbbadd 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.5',
+ version: '1.20.6',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')