]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 30 Apr 2015 05:27:21 +0000 (22:27 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 30 Apr 2015 05:27:21 +0000 (22:27 -0700)
* PHP-5.4:
  Upgrade to PCRE 8.37 due to various bugfixes

1  2 
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_exec.c

Simple merge
Simple merge