]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6.18
authorStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
commit2f1ce4f209925a81a07797e48238db711b10b695
treea80352cc3e7684c5b246879115034219e1569b87
parent5bde5a0a2eb09fa6d7bc8024533fe4d1fa04c817
parentca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62
Merge branch 'PHP-5.5' into PHP-5.6.18

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