]> granicus.if.org Git - php/commit
Merge commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62' into PHP-7.0.3
authorStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 03:35:59 +0000 (19:35 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 03:35:59 +0000 (19:35 -0800)
commit0007a695c8e6fb9c11c7167428070af980269c2f
treedc2180e67a17f5b7cd8d0c54fc6991d7bccde40e
parent877823e20952a86226bc15f3c364e1b4c12ec117
parentca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62
Merge commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62' into PHP-7.0.3

* commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62':
  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/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