diff options
author | Adam Jackson <ajax@redhat.com> | 2018-05-14 14:08:01 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2018-05-14 14:09:48 -0400 |
commit | f50afa19fd67ca8a059eb909814a4d673bcb5a31 (patch) | |
tree | cd702fc18bdfd131ef9e54fc707989bf6a16731c | |
parent | 82f8fc5ffc0065537896ec43ae60d67d9a164c75 (diff) |
Post-1.20 version bump
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | meson.build | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2b21667ee..ddc47faa2 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.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2018-05-10" -RELEASE_NAME="Avocado Toast" +AC_INIT([xorg-server], 1.20.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2018-05-14" +RELEASE_NAME="Carrot and Ginger Soup" 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 c8df31b3b..b89c3d426 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project('xserver', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '1.20.0', + version: '1.20.99.1', meson_version: '>= 0.42.0', ) add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c') |