diff options
| author | Ferenc Kovacs <tyra3l@gmail.com> | 2016-08-04 01:42:00 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyra3l@gmail.com> | 2016-08-04 01:42:00 +0200 |
| commit | db4211a8fee3079d5b53c6673c75afe41eb6a8f6 (patch) | |
| tree | c7ffa887827c0122376f1e7f62a00cd305d2489e /ext/mbstring/php_mbregex.c | |
| parent | 138689ffb7f0a35912ecea19ca3c1964ed3f4c3b (diff) | |
| parent | 562c17eb4e78541a2aa648aef6a4454636d54f09 (diff) | |
| download | php-git-db4211a8fee3079d5b53c6673c75afe41eb6a8f6.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions