aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
committermarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
commit68c12003597662f95eac07ddeee99637f7caa3e5 (patch)
tree7be6c75560e85d73363da29707ed674ecf11552f /xorg-server/configure.ac
parente8eef3451671e4bea36194c85c16241e80163f8d (diff)
parentf93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff)
downloadvcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.gz
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.bz2
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver libxcb xcbproto mesa xkeyboard-config git update 27 Dec 2013
Diffstat (limited to 'xorg-server/configure.ac')
-rw-r--r--xorg-server/configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 7ec19976b..8f823863d 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/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.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-12-19"
-RELEASE_NAME="Kraken"
+AC_INIT([xorg-server], 1.15.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-12-27"
+RELEASE_NAME="Egg Nog"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_USE_SYSTEM_EXTENSIONS