]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33e32cb 19ad138)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:41:18 +0000 (23:41 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:41:18 +0000 (23:41 -0700)
* PHP-5.6:
  Upgrade PCRE to 8.36, it fixes some crashes

Conflicts:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_ucd.c

1  2 
ext/pcre/pcrelib/config.h patch | diff1 | diff2 | blob | history

diff --cc ext/pcre/pcrelib/config.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.