diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-15 16:58:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-15 16:58:22 +0800 |
| commit | d1b48a8b02d2fcee393aab7921d16054d323729b (patch) | |
| tree | bd1b2a0174e390a76037e7787a88dad1b900b877 /main | |
| parent | 101c055396c3ef07bd6b0aa0bb0b889c7ab7d437 (diff) | |
| parent | b01b971ec0eb5628d82b80b27365db383b375dba (diff) | |
| download | php-git-d1b48a8b02d2fcee393aab7921d16054d323729b.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Conflicts:
ext/mysqli/mysqli_api.c
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 39c858ea64..d48ab24141 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,6 +1,6 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ -#define PHP_MAJOR_VERSION 7 +#define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" |