diff options
| author | Julien Pauli <jpauli@php.net> | 2015-04-29 11:16:06 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-04-29 11:16:06 +0200 |
| commit | 775d0707ca2f802c9db549aa442be82fc09362ab (patch) | |
| tree | 8ef5b89a06ea62597ffaf95846b8381b10b297e1 | |
| parent | 6a5798d990e1d1ad62a627d5cebd455214ca5c37 (diff) | |
| download | php-git-775d0707ca2f802c9db549aa442be82fc09362ab.tar.gz | |
5.5.26 now
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,6 +1,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.5.25 +?? ??? 2015, PHP 5.5.26 + + + +14 May 2015, PHP 5.5.25 - Core: . Fixed bug #69467 (Wrong checked for the interface by using Trait). diff --git a/configure.in b/configure.in index 1669739f06..ba1ecb7609 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=5 -PHP_RELEASE_VERSION=25 +PHP_RELEASE_VERSION=26 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 053bc564dd..2aa246653a 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 5 -#define PHP_RELEASE_VERSION 25 +#define PHP_RELEASE_VERSION 26 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.25-dev" -#define PHP_VERSION_ID 50525 +#define PHP_VERSION "5.5.26-dev" +#define PHP_VERSION_ID 50526 |