On 01.12.2009 11:16, Ian Romanick wrote: > Speaking of which... there are a bunch of conflicts merging 7.7 to > master in Galliumland. Could one of you guys take a look at it? I have > no clue what's going on over there. Quite a few of that was due to the gallium interface changes (introduced by width0 branch merge). It will get only worse when I merge gallium-noblocks branch (not quite there yet). Those changes are fairly intrusive as those API changes affect a lot of files/code.
Roland ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
