diff options
| author | Anatol Belski <ab@php.net> | 2014-05-04 21:12:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-04 21:12:47 +0200 |
| commit | 2044884812f9b7ab08ecb72ab9edf78645b78a84 (patch) | |
| tree | 4aeb7ddbf2d70c1b4d96d5505290b8c83e6bef0d /sapi/phpdbg/phpdbg_help.c | |
| parent | ba19cc7b451b9063dd349d681d2c231648de7207 (diff) | |
| parent | 003ba74d99846755e5c2b5f562531f9b12d9bfb1 (diff) | |
| download | php-git-2044884812f9b7ab08ecb72ab9edf78645b78a84.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (28 commits)
/me blushes, really hard
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Fix mysqli build when building against libmysqlclient.
Fix author name on the #63228 patch.
Fixed bug #67169: []= after_array_splice incorrect
Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
show leaks in their own group
Use the right path for the suggested PHP invocation in ext_skel.
Changed to more understandable NEWS message
one heading is enough
add new NEWS block for alpha3
XFAIL the leaking multibyte tests, we should really get to the bottom of this
Fixed numbering in UPGRADING file
Updated NEWS for fixed phpdbg issue #85
Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
add missing NEWS entry to the correct release where it was added
5.5.12 was released yesterday
add missing NEWS entry to the correct release where it was added
Updated NEWS entry for phpdbg
...
Conflicts:
ext/curl/interface.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions