diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-01 12:50:40 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-01 12:50:40 -0700 |
| commit | 4975019dd7077a83112b3ba1f7b4ddb9969da79b (patch) | |
| tree | 6782dd9511800228795b99378ca576373a5df4c0 /ext/reflection/php_reflection.c | |
| parent | ec760d8fffe7e6f56b458d477dd2dfdda73329ec (diff) | |
| parent | 2d9399af3514189375f34610acc33a34de44d772 (diff) | |
| download | php-git-4975019dd7077a83112b3ba1f7b4ddb9969da79b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Conflicts:
ext/date/php_date.c
ext/date/tests/DateTime_verify.phpt
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions