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 /build | |
| 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 'build')
| -rw-r--r-- | build/build.mk | 2 | ||||
| -rw-r--r-- | build/build2.mk | 2 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 2 | ||||
| -rw-r--r-- | build/mkdep.awk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/build/build.mk b/build/build.mk index 5dd81ee0e9..007f081f19 100644 --- a/build/build.mk +++ b/build/build.mk @@ -1,5 +1,5 @@ # +----------------------------------------------------------------------+ -# | PHP Version 5 | +# | PHP Version 7 | # +----------------------------------------------------------------------+ # | Copyright (c) 1997-2014 The PHP Group | # +----------------------------------------------------------------------+ diff --git a/build/build2.mk b/build/build2.mk index be103fc322..2d9e684ec0 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -1,5 +1,5 @@ # +----------------------------------------------------------------------+ -# | PHP Version 5 | +# | PHP Version 7 | # +----------------------------------------------------------------------+ # | Copyright (c) 1997-2007 The PHP Group | # +----------------------------------------------------------------------+ diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 8ff3531825..f8f827d671 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -1,6 +1,6 @@ #! /bin/sh # +----------------------------------------------------------------------+ -# | PHP Version 5 | +# | PHP Version 7 | # +----------------------------------------------------------------------+ # | Copyright (c) 1997-2007 The PHP Group | # +----------------------------------------------------------------------+ diff --git a/build/mkdep.awk b/build/mkdep.awk index 06547c79c1..c1adefe612 100644 --- a/build/mkdep.awk +++ b/build/mkdep.awk @@ -1,5 +1,5 @@ # +----------------------------------------------------------------------+ -# | PHP Version 5 | +# | PHP Version 7 | # +----------------------------------------------------------------------+ # | Copyright (c) 2000-2006 The PHP Group | # +----------------------------------------------------------------------+ |