]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82ecdcd 220e0d4)
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Tue, 29 Apr 2014 22:07:49 +0000 (00:07 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 29 Apr 2014 22:07:49 +0000 (00:07 +0200)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.