summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-02-25 13:31:13 -0500
committerAdam Jackson <ajax@redhat.com>2019-02-25 13:31:13 -0500
commit94f036d412f4f426abe950b57b9ec99b78068c39 (patch)
treed8e81488084c78ba61b37d06c9f5598d2643ae4f
parent9850d20c2aa2d8380f2e9c4521ef3c46a6c8fb00 (diff)
xserver 1.20.4xorg-server-1.20.4
Signed-off-by: Adam Jackson <ajax@redhat.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 c079ca476..30544218a 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.3, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2018-10-25"
-RELEASE_NAME="Harissa Roasted Carrots"
+AC_INIT([xorg-server], 1.20.4, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2019-02-25"
+RELEASE_NAME="Chestnut Tortelloni"
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 ec9a24be6..999c40891 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.3',
+ version: '1.20.4',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')