diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-05 10:49:21 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-05 10:49:21 -0700 |
| commit | 768c776d30c48e601ed99b606ed2c463041041cd (patch) | |
| tree | 360823fee1a3c34e80b3e8ec6f28d563954864f9 | |
| parent | 2452e7b68067b053f289aec46864b77c2a158a68 (diff) | |
| parent | 0e10f26e277b8916b2a8eee2b975cd9e436a8fb7 (diff) | |
| download | php-git-768c776d30c48e601ed99b606ed2c463041041cd.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Julien Pauli
# Via Julien Pauli
* 'PHP-5.5' of https://git.php.net/repository/php-src:
5.5.5 now
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2013, PHP 5.5.5 + ?? ??? 2013, PHP 5.5.4 - Core: diff --git a/configure.in b/configure.in index 47ce23c520..40130626cb 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=4 +PHP_RELEASE_VERSION=5 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 4a538a4138..d9ea4aab3c 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 4 +#define PHP_RELEASE_VERSION 5 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.4-dev" -#define PHP_VERSION_ID 50504 +#define PHP_VERSION "5.5.5-dev" +#define PHP_VERSION_ID 50505 |