]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:05:46 +0000 (21:05 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Feb 2016 05:06:31 +0000 (21:06 -0800)
commit00788f9cfbdca9b52b148b7219c9ba05cdc6e130
treef570f943497d09d96969526fd0c8b5467d8f9d3b
parentef356912b3c4e114d373960178fb8bf138668566
parentca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)
NEWS
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/doc/pcre.txt
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/pcre_study.c