Gustavo, feel free to improve the aesthetics of my merge. I was quite surprised by the amount of difference of the source layout :)
On 2 October 2013 15:55, Michael Wallner <m...@php.net> wrote: > Commit: 2ba39268151549f03140ec3d260cf9489336ec93 > Author: Michael Wallner <m...@php.net> Wed, 2 Oct 2013 15:55:38 > +0200 > Parents: 60e38b3243577abc80ce6bbcfb0b4125b08acb85 > 9209c19f8f7eef807cb457b32d3ab517ff8dc178 > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=2ba39268151549f03140ec3d260cf9489336ec93 > > Log: > Merge branch 'PHP-5.4' into PHP-5.5 > > * PHP-5.4: > fix bug #65808 the socket_connect() won't work with IPv6 address > 5.4.22-dev now > > Conflicts: > configure.in > ext/sockets/sockets.c > main/php_version.h > > Bugs: > https://bugs.php.net/65808 > > Changed paths: > MM ext/sockets/multicast.c > MM ext/sockets/multicast.h > MA ext/sockets/sockaddr_conv.c > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php -- Regards, Mike -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
