diff options
| author | Julien Pauli <jpauli@php.net> | 2014-11-21 15:50:27 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-11-21 15:50:27 +0100 |
| commit | ab3525c40124cd569fbde32a0bb123348b1048bc (patch) | |
| tree | eef9de8007c34155141769cecc7b6cf7865513db /ext/reflection/php_reflection.h | |
| parent | 64b9277867cb0da1a68a122b0a9fe6dfb78d9c84 (diff) | |
| parent | cd3b46f28af49e5eaaa687d5d186e641ce147853 (diff) | |
| download | php-git-ab3525c40124cd569fbde32a0bb123348b1048bc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #68185 - Inconsistent insteadof definition
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'ext/reflection/php_reflection.h')
0 files changed, 0 insertions, 0 deletions