]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Thu, 30 Apr 2015 05:31:06 +0000 (22:31 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 30 Apr 2015 05:34:54 +0000 (22:34 -0700)
* PHP-5.6:
  Upgrade to PCRE 8.37 due to various bugfixes

Conflicts:
ext/pcre/config.w32
ext/pcre/config0.m4
ext/pcre/pcrelib/pcre_jit_compile.c
ext/pcre/pcrelib/sljit/sljitConfig.h
ext/pcre/pcrelib/sljit/sljitConfigInternal.h
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
ext/pcre/pcrelib/sljit/sljitUtils.c

1  2 
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/README
ext/pcre/pcrelib/pcre_compile.c
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/pcre_internal.h
ext/pcre/pcrelib/pcre_study.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge