summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-11-27 14:39:40 +0400
committerDmitry Stogov <dmitry@zend.com>2013-11-27 14:39:40 +0400
commit92b76680e9489d1872e4a29cefd98d28cfb7409a (patch)
treee42c3da691f0755bcdf8ccaa3edc73423e43fd53 /ext/pcre/php_pcre.c
parente9c6a1cfd21b784033cf40248464021a68aaa380 (diff)
parent16d59aa1718324ff0d4bea62fa9dfc3d4c8b16ce (diff)
downloadphp-git-92b76680e9489d1872e4a29cefd98d28cfb7409a.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: 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