diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-19 23:23:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-19 23:23:21 -0700 |
| commit | 53d96434313f245e07990ea910820b102a9bc3d7 (patch) | |
| tree | c70c3f272fb3075392d19772a7486231c361a6ff /configure.in | |
| parent | 1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8 (diff) | |
| parent | d487f5e9acc55fb76d71c40e451efebbc087af35 (diff) | |
| download | php-git-53d96434313f245e07990ea910820b102a9bc3d7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
bump version
Update NEWS
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 19c96d4151..47ce23c520 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=2 +PHP_RELEASE_VERSION=4 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` |