diff options
| author | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
| commit | b16929ca7294fb047e63eb6c04d715d980a50c47 (patch) | |
| tree | e8ccc6acd38dbf670380cccc500100279d74f53d /main/php_version.h | |
| parent | bba16dde5ded45802543712bb3b9fe6e93b10751 (diff) | |
| parent | 9266227402f50e1ad9953952b68a5ff3a25806b0 (diff) | |
| download | php-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'main/php_version.h')
| -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 6f65548d01..e7478d5ce6 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 15 +#define PHP_RELEASE_VERSION 18 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.15-dev" -#define PHP_VERSION_ID 50515 +#define PHP_VERSION "5.5.18-dev" +#define PHP_VERSION_ID 50518 |