Skip to content

Commit 31ab04e

Browse files
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Bump to next version Conflicts: configure.in main/php_version.h
2 parents 72f19e9 + 0956c00 commit 31ab04e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
119119

120120
PHP_MAJOR_VERSION=5
121121
PHP_MINOR_VERSION=4
122-
PHP_RELEASE_VERSION=2
122+
PHP_RELEASE_VERSION=3
123123
PHP_EXTRA_VERSION="-dev"
124124
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
125125
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

main/php_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* edit configure.in to change version number */
33
#define PHP_MAJOR_VERSION 5
44
#define PHP_MINOR_VERSION 4
5-
#define PHP_RELEASE_VERSION 2
5+
#define PHP_RELEASE_VERSION 3
66
#define PHP_EXTRA_VERSION "-dev"
7-
#define PHP_VERSION "5.4.2-dev"
8-
#define PHP_VERSION_ID 50402
7+
#define PHP_VERSION "5.4.3-dev"
8+
#define PHP_VERSION_ID 50403

0 commit comments

Comments
 (0)