summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-10-15 11:17:35 -0400
committerAdam Jackson <ajax@redhat.com>2018-10-15 11:17:35 -0400
commit2a0c6c15c35cd262e7cdb86dcc43cb1aeb714c8e (patch)
tree419ccd585644d73c1de650187bd77c36774b4a52
parentf5dc787fc9bb102e4eea477d1817e35370084ea2 (diff)
xserver 1.20.2xorg-server-1.20.2
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 7694d80d9..6a8668311 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.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2018-08-07"
-RELEASE_NAME="Kale Salad"
+AC_INIT([xorg-server], 1.20.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2018-10-15"
+RELEASE_NAME="Tofu Biryani"
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 956cf96a4..291753d8d 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.1',
+ version: '1.20.2',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')