]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'weltling/master' POST_64BIT_BRANCH_MERGE
authorAnatol Belski <ab@php.net>
Fri, 22 Aug 2014 06:58:03 +0000 (08:58 +0200)
committerAnatol Belski <ab@php.net>
Fri, 22 Aug 2014 06:58:03 +0000 (08:58 +0200)
* weltling/master: (725 commits)
  fix zpp
  fixed array_pad()
  fix zpp
  fix zpp
  fix zpp
  fix zpp and a bit more
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fixed the test
  ...

1  2 
ext/iconv/iconv.c
ext/zlib/zlib_filter.c

Simple merge
Simple merge