]> granicus.if.org Git - php/commit
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)
commitce6db558f9c0dc3657f481650642f293ee7cb2c4
tree0d56954e9c921b38db6e6bdad442290144e0ebd0
parent775d0707ca2f802c9db549aa442be82fc09362ab
parent95fa72799298300f310c630a6c854f511d083bcc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Upgrade to PCRE 8.37 due to various bugfixes
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_exec.c