diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-04-30 00:07:49 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-04-30 00:07:49 +0200 |
| commit | 98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5 (patch) | |
| tree | 5f806300153b3215a1ba590c5becc94b2911ea9a /sapi/phpdbg/phpdbg_set.h | |
| parent | 82ecdcdb6352f851e351f70f19b85aff06de0e4b (diff) | |
| parent | 220e0d4a5597e2c5248f77da6e88983b9fdd3808 (diff) | |
| download | php-git-98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
* origin/PHP-5.5:
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
Conflicts:
ext/mbstring/tests/zend_multibyte-08.phpt
Diffstat (limited to 'sapi/phpdbg/phpdbg_set.h')
0 files changed, 0 insertions, 0 deletions