diff options
| author | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
| commit | 29e755ac6669fa1801bf1e1c1e6acee8d78c9498 (patch) | |
| tree | fa033f900da9649cf5064c7a9d2a4a8916403ee1 /main/php_version.h | |
| parent | 8495d6303400edd9b84a6febd2a6b62b38e11c97 (diff) | |
| parent | b0a36007abb522b6b1e3a6b3108eb726053b9d72 (diff) | |
| download | php-git-29e755ac6669fa1801bf1e1c1e6acee8d78c9498.tar.gz | |
Merge branch 'PHP-5.4' into JSONWhitespaceFix
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 e30528ed51..3058fef613 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 4 -#define PHP_RELEASE_VERSION 21 +#define PHP_RELEASE_VERSION 22 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.21-dev" -#define PHP_VERSION_ID 50421 +#define PHP_VERSION "5.4.22-dev" +#define PHP_VERSION_ID 50422 |