]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0292c34 bcdbd47)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:37:54 +0000 (14:37 +0200)
committerAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:37:54 +0000 (14:37 +0200)
* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
sapi/cgi/fastcgi.c

1  2 
sapi/cgi/fastcgi.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cgi/fastcgi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.