diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /main/php_version.h | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'main/php_version.h')
| -rw-r--r-- | main/php_version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/php_version.h b/main/php_version.h index f88ce5e69e..4714e5dc4b 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,8 +1,8 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 7 -#define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 9 +#define PHP_MINOR_VERSION 1 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "7.0.9-dev" -#define PHP_VERSION_ID 70009 +#define PHP_VERSION "7.1.0-dev" +#define PHP_VERSION_ID 70100 |