diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 20:51:37 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 20:51:37 +0400 |
| commit | 0019b512ff624d2fed722022b7c4688be10653ff (patch) | |
| tree | bdefe5c968be894acbd02a434d74b374c9122cc0 /ext/pgsql/php_pgsql.h | |
| parent | 4f8a84b2e70af341560e271a824159bf9b814cf9 (diff) | |
| parent | 3fff53fc5790918bea9a8c04a04a9d8c79ebdbf6 (diff) | |
| download | php-git-0019b512ff624d2fed722022b7c4688be10653ff.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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
Conflicts:
ext/opcache/ZendAccelerator.h
Diffstat (limited to 'ext/pgsql/php_pgsql.h')
0 files changed, 0 insertions, 0 deletions