On Sat, Aug 16, 2014 at 12:57 PM, Marc Bennewitz <php@mabe.berlin> wrote: > > > On 15.08.2014 22:39, Andrea Faulds wrote: >> >> >> On 15 Aug 2014, at 19:57, Marc Bennewitz <php@mabe.berlin> wrote: >> >>> Sara, >>> >>> shouldn't it be merged into the branches PHP-5.4, PHP-5.5 as well as >>> PHP-5.6 and shouldn't there an info in the NEWS file? It's currently >>> only merged to master. >>> >>> Marc >> >> >> There might be an argument against adding to 5.4 and 5.5 in that code may >> now give slightly different results from before, and it’s not really a >> bugfix as there was no bug. > > > Is the master branch the current 5.6 branch or should it be merged into the > PHP-5.6 branch to go in there?
Master targets 7. 5.6 has its own branch. -- Pierre @pierrejoye | http://www.libgd.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php