]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc34aba472c4bf4f92f8fb47df6f6b2126bc86be5
tree532ec2d824c38d078a19e3dad23ee6469392ec75tree | snapshot
parent33e32cbe5b860df1a919ba8ed536ed12397a3829commit | diff
parent19ad1389aaf0d964de918857164a6ef45f444158commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Upgrade PCRE to 8.36, it fixes some crashes

Conflicts:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_ucd.c
ext/pcre/pcrelib/config.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.