diff options
| author | Anatol Belski <ab@php.net> | 2014-05-19 09:44:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-19 09:44:18 +0200 |
| commit | ce8f7cb79485c76c21ecb95b568696b6249cbebd (patch) | |
| tree | fed9b4d55e58f0cd39f30afce5db236bfdd3ecf6 /sapi/phpdbg/phpdbg.h | |
| parent | 4fb177b916741762499697b10ff094a936a43b02 (diff) | |
| parent | 7df1e42d8a134bdcc63ce33a6f7be8cdbc75de58 (diff) | |
| download | php-git-ce8f7cb79485c76c21ecb95b568696b6249cbebd.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
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
Fix bug #67060: use default mode of 660
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
0 files changed, 0 insertions, 0 deletions