diff options
| author | Nikita Popov <nikic@php.net> | 2012-07-01 16:38:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-07-01 16:38:26 +0200 |
| commit | b7903f9778a57fda71867f9661505f635d602067 (patch) | |
| tree | da77c7465af291947147fbb3ffc67dec641aeb58 /main | |
| parent | 9cbd7a24b6d1d61e51fd6d32669dcfa1df30c883 (diff) | |
| download | php-git-b7903f9778a57fda71867f9661505f635d602067.tar.gz | |
Revert JSON merges to 5.4
This reverts the following merge commits (-m 1):
405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_version.h b/main/php_version.h index 4b7709c552..6b49f40864 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -5,4 +5,4 @@ #define PHP_RELEASE_VERSION 5 #define PHP_EXTRA_VERSION "-dev" #define PHP_VERSION "5.4.5-dev" -#define PHP_VERSION_ID 50405 +#define PHP_VERSION_ID 50404 |