]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:29:46 +0000 (21:29 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:39:24 +0000 (21:39 -0800)
commit916c1fb3af99706f73c5974616834bb5a71909e3
tree79830573abe59a1e1e938830db31e3e66cc77e44
parent265ccef39bacb3982e4c9a7d7fc589ee1af4da52
parent00788f9cfbdca9b52b148b7219c9ba05cdc6e130
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

Conflicts:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/doc/pcre.txt
ext/pcre/pcrelib/pcre_compile.c
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/pcre_internal.h
ext/pcre/pcrelib/pcre_study.c
ext/pcre/pcrelib/pcre_xclass.c
ext/pcre/tests/backtrack_limit.phpt