From 11cddaf6f4e4ace569d429f21e5b581e7602f27e Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 17 Sep 2015 01:48:02 +0200 Subject: [PATCH] prepare for PHP-5.6.14RC1 --- NEWS | 4 +++- configure.in | 2 +- main/php_version.h | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 95fbde1943..6ab3ef960d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.6.14 +?? ??? 2015, PHP 5.6.15 + +01 Oct 2015, PHP 5.6.14 - Core: . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when diff --git a/configure.in b/configure.in index 01277b8c19..018d20cde6 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=6 -PHP_RELEASE_VERSION=14 +PHP_RELEASE_VERSION=15 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 8f59951501..92c8af871e 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 6 -#define PHP_RELEASE_VERSION 14 +#define PHP_RELEASE_VERSION 15 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.6.14-dev" -#define PHP_VERSION_ID 50614 +#define PHP_VERSION "5.6.15-dev" +#define PHP_VERSION_ID 50615 -- 2.40.0