]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7d4733 06c0540)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 17 Aug 2016 11:23:31 +0000 (13:23 +0200)
committerAnatol Belski <ab@php.net>
Wed, 17 Aug 2016 11:23:31 +0000 (13:23 +0200)
* PHP-7.0:
  fix char * vs zend_string *

1  2 
ext/wddx/wddx.c patch | diff1 | diff2 | blob | history

diff --cc ext/wddx/wddx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.