diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:38 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:38 -0300 |
| commit | 9d8a00337dc92273e1006cfc72e21dcc4217fa9b (patch) | |
| tree | 2dd0a1f17ceccc64c6d5d31b20cf414fc7cd8384 /ext/mbstring/php_mbregex.c | |
| parent | ece7421864354b11e93a2b49f1409cceebd1225e (diff) | |
| parent | b99862e7ae4336c5bdb20514f845e63c6c1b43f6 (diff) | |
| download | php-git-9d8a00337dc92273e1006cfc72e21dcc4217fa9b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions