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 /main | |
| 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 'main')
| -rw-r--r-- | main/php_version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_version.h b/main/php_version.h index e760d29346..4a538a4138 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 2 +#define PHP_RELEASE_VERSION 4 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.2-dev" -#define PHP_VERSION_ID 50502 +#define PHP_VERSION "5.5.4-dev" +#define PHP_VERSION_ID 50504 |