diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-22 00:41:06 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-22 00:41:06 -0800 |
| commit | 515fa6160d22156f605a9bcb41db810ccad99097 (patch) | |
| tree | 3f79ecb1c57038cbe28c642e49aba60e7b4126ad /ext/mbstring/php_mbregex.h | |
| parent | 9a06628c8025d14ef4caaf0bac3a659289dea7df (diff) | |
| parent | bc55af0cf22aa419376b52fbd3f4c7310ab07d77 (diff) | |
| download | php-git-515fa6160d22156f605a9bcb41db810ccad99097.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "made lsapi_main.c compatible with PHP7/phpng ."
Updated NEWS
Diffstat (limited to 'ext/mbstring/php_mbregex.h')
0 files changed, 0 insertions, 0 deletions