diff options
| author | Nikita Popov <nikic@php.net> | 2015-05-29 11:11:02 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-05-29 11:11:02 +0200 |
| commit | 39753fa222b42d806bb622bac22e27b4381ff099 (patch) | |
| tree | 9c630881c865a8513d726f7a7402403ad48f2679 /ext/pdo_mysql/mysql_statement.c | |
| parent | 402f697068ee10155497d28a32d3e8e955f5fec2 (diff) | |
| parent | e7d0ca39e5030226d3c237a481b1c50d8a2db2f3 (diff) | |
| download | php-git-39753fa222b42d806bb622bac22e27b4381ff099.tar.gz | |
Merge branch 'PHP-5.6'
Preserving HAS_RETURN_TYPE for __invoke() here as well.
Conflicts:
Zend/zend_alloc.c
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
0 files changed, 0 insertions, 0 deletions