diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:56:18 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:56:18 +0400 |
| commit | a908afeaa59c7f991844de989f0a18f34e72b49e (patch) | |
| tree | 721057d167b63a0950a396ba02603a6fd430bcf7 /ext/pcre/php_pcre.c | |
| parent | 1daa1ab4d12a207477efb20e5a1f5f79e0309d74 (diff) | |
| parent | 92b76680e9489d1872e4a29cefd98d28cfb7409a (diff) | |
| download | php-git-a908afeaa59c7f991844de989f0a18f34e72b49e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions