diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
| commit | fb17d6516d65c870cd47354598f0daf5d17f1df7 (patch) | |
| tree | 00a84c3085bac850cf1960ebbca2c82efca03ae4 /scripts | |
| parent | b3aebda9eaf55706af2e21178f229a171725a168 (diff) | |
| parent | 2fc1a1dce557875d029f16d58bd3d4cd22af54fb (diff) | |
| download | php-git-fb17d6516d65c870cd47354598f0daf5d17f1df7.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fixed copying of the struct as it's not being modified
avoid strlen usage in loop
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/dev/credits | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/dev/credits b/scripts/dev/credits index 801637cd19..5be84fda07 100755 --- a/scripts/dev/credits +++ b/scripts/dev/credits @@ -10,9 +10,9 @@ do /* DO NOT EDIT THIS FILE! - it has been automaticaly created by php5/scripts/credits from - the information found in the various php5/ext/.../CREDITS and - php5/sapi/.../CREDITS files + it has been automaticaly created by php7/scripts/credits from + the information found in the various php7/ext/.../CREDITS and + php7/sapi/.../CREDITS files if you want to change an entry you have to edit the appropriate CREDITS file instead |