Jakob Bornecrantz wrote: > On 24 jun 2009, at 16.40, Brian Paul wrote: > >> Jakob Bornecrantz wrote: >>> Hi Brian and Eric >>> >>> Can one or both of you do a merge of the 7_5_branch there are some >>> conflicts and I don't want to mess up code I don't know anything >>> about. That would be most kind, thanks. >> Will do. Hold on... > > Awesome, thanks!
Done. Just a reminder to everyone: if you have bug fixes that should go into 7.5 and later, commit them to the mesa_7_5_branch branch. I've been periodically merging the 7.5 branch to master. -Brian ------------------------------------------------------------------------------ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
