]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:56 +0000 (08:48 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:56 +0000 (08:48 -0700)
* PHP-5.6:
  Remove 550+ compile warnings on OS X

1  2 
ext/mysqlnd/mysqlnd_debug.h

Simple merge