diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 20:55:02 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 20:55:02 +0200 |
| commit | aa761baea133ffb08022e416d35ad461bb7ea106 (patch) | |
| tree | e5806516f849a2a93e96ade2a16de3f8cba1e8cf | |
| parent | 14406e262ae876a098cba0bb4095c8c5406602ca (diff) | |
| parent | 899fb6b6a7cb4fb340f221ca9494f0f00a8b8183 (diff) | |
Merge remote-tracking branch 'origin/server-1.14-branch' into obsd-server-1.14-branchobsd-server-1.14-branch
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1e30f8bc6..775766130 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.14.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2014-04-13" -RELEASE_NAME="Purple Haze" +AC_INIT([xorg-server], 1.14.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2014-06-05" +RELEASE_NAME="Purple Monkey" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) |