diff options
| author | Anatol Belski <ab@php.net> | 2014-05-26 08:39:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-26 08:39:06 +0200 |
| commit | a4a5e34ed9d79637d4e065a21dec7876617334f1 (patch) | |
| tree | f5d0de4ab2bd16eaac635ce062297ba03d60844f /sapi/phpdbg/phpdbg_btree.h | |
| parent | 63f57b59016f45796a915173c2904217375c63de (diff) | |
| parent | 317e8058e0a2e401a1aadedd2d596f499c58691d (diff) | |
| download | php-git-a4a5e34ed9d79637d4e065a21dec7876617334f1.tar.gz | |
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (29 commits)
Fixed issue #183 (TMP_VAR is not only used once)
Fix broken Junit output with --disable-cgi
Added folder mark
Further test fixes for the fdb2709 breakage.
Fix broken test caused by fdb2709.
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Improved test for bug #62479
fix typo in ODBC code
Support for __debugInfo (Joe Watkins)
Optimize ZEND_POW (Rouven Weßling)
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Prevent recursion in ZF2 Parameters class
5.5.14 now
adding NEWS block for beta4
5.4.30 next
enable email notifications
update NEWS
update NEWS
...
Conflicts:
ext/opcache/ZendAccelerator.h
ext/spl/spl_array.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_btree.h')
0 files changed, 0 insertions, 0 deletions