com php-src: 5.5.25: NEWS configure.in main/php_version.h

From: Date: Tue, 12 May 2015 13:40:45 +0000
Subject: com php-src: 5.5.25: NEWS configure.in main/php_version.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86694@lists.php.net to get a copy of this message
Commit: de36fb170f50919dfe234d16951c7709c059aba6 Author: Julien Pauli <jpauli@php.net> Tue, 12 May 2015 15:40:45 +0200 Parents: bba7c814362917da8ca84fe0ab89778a3e6ede01 Branches: PHP-5.5.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de36fb170f50919dfe234d16951c7709c059aba6 Log: 5.5.25 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 19d7974..91c4ed0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -30 Apr 2015, PHP 5.5.25RC1 +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 ad99d86..e6df1df 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 PHP_RELEASE_VERSION=25 -PHP_EXTRA_VERSION="RC1" +PHP_EXTRA_VERSION="" 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 27b1d6f..e20bd0b 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 25 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.5.25RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.5.25" #define PHP_VERSION_ID 50525

« previous php.cvs (#86694) next »