diff options
| author | Christopher Jones <sixd@php.net> | 2012-05-03 12:22:39 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-05-03 12:22:39 -0700 |
| commit | 31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 (patch) | |
| tree | 52a399b87ca2e62fc805747442f39d28a35535bf /main | |
| parent | 72f19e9a8bcf5712b24fa333a26616eff19ac1ce (diff) | |
| parent | 0956c00af999c295c5a13644ec835da8f96ad48d (diff) | |
| download | php-git-31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Bump to next version
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 13478d1756..3e80008c14 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 2 +#define PHP_RELEASE_VERSION 3 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.2-dev" -#define PHP_VERSION_ID 50402 +#define PHP_VERSION "5.4.3-dev" +#define PHP_VERSION_ID 50403 |