On Tue, Mar 25, 2003 at 06:52:57AM -0700, Brian Paul wrote:
Alan Hourihane wrote:
On Tue, Mar 25, 2003 at 01:40:57AM +0000, Alan Hourihane wrote:
I'll finish up tomorrow, sorry for the build bustage for now.
O.k. there's another issue here. I think I remember Ian merging in a fairly early rev of Mesa 5.1 into the trunk which is causing a lot of merge conflicts.
So I'm going to merge in the current Mesa 5.1 sources and there'll
be some fixing up to do of the Imakefiles once I'm finished with the
rest of the 4.3.0 merge.
I think you mean Mesa 5.0.1, not 5.1. When you're done, the Mesa code in the DRI trunk should match the mesa_5_0_branch from Mesa CVS. I resolved the changes Ian made a while back.
I can take care of that if you'd like.
I really did mean 5.1, and that's what I've merged in. Aren't we striving for Mesa 5.1 support now ?
We haven't tended to merge in non-stable Mesa versions - I'm a bit behind on the current Mesa release status, but has there actually been a 5.1 release, or is this still the trunk code?
I'm not averse to changing this policy for this merge (as opposed to backing these changes out & bringing something else in).
Keith
------------------------------------------------------- This SF.net email is sponsored by: The Definitive IT and Networking Event. Be There! NetWorld+Interop Las Vegas 2003 -- Register today! http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
