]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5683b6f f38ca75)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)
* PHP-5.4:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next

Conflicts:
configure.in
main/php_version.h

1  2 
ext/pcre/pcrelib/config.h patch | diff1 | diff2 | blob | history

diff --cc ext/pcre/pcrelib/config.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.