diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-08 02:02:42 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-08 02:04:11 -0700 |
| commit | a3f09eb323986fa8e8c4c6e398071eedc6add02e (patch) | |
| tree | ac775d2c5df598e813fc210e4ad834ade9869842 /ext/mbstring/php_mbregex.c | |
| parent | aa1a25e303220db8cf829d686cf9ed03a2225d6e (diff) | |
| parent | cf2b9955d4c26393f6d16b71b5c2c69d8d2b7f52 (diff) | |
| download | php-git-a3f09eb323986fa8e8c4c6e398071eedc6add02e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
oops, 5.4 and 5.5 use malloc in TSRM
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions