diff options
author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
---|---|---|
committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /sapi/embed | |
parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'sapi/embed')
-rw-r--r-- | sapi/embed/php_embed.c | 2 | ||||
-rw-r--r-- | sapi/embed/php_embed.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 230b3a649d..e0df666108 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 84c0e36336..b62fd9fe24 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ |