Eric Anholt wrote: > On Tue, 2009-02-17 at 16:24 -0700, Brian Paul wrote: >> Nicolai Hähnle wrote: >>> This is to announce the release of piglit v1. >> [...] >> >> Congrats on the release, Nicolai. >> >> Just a few notes about glean: >> >> The glean code in piglit might be a little out of date. I recently >> brought over a few updates/fixes from the glean tree, but there's >> probably more that should be pulled in. >> >> I've probably added 4-5 new glean tests so far this year. Do you want >> all glean tests to be incorporated into piglit, or just specific ones >> that interest you? Note- I'm not volunteering to do that right now, >> just asking. :) > > I was actually updating the glean bits again monday, but ran into a > bunch of conflicts due to the header mess from cleanups in piglit to fix > the warnings about using out-of-date header names, and your updates that > put things in directly in master instead of going through the > glean-master branch and merging that in like I had done for previous > glean updates. Then I got tripped up by the two misc.cpp files, and I > gave up until another day. > > For the future, please put glean-imports-from-cvs into glean-master, > then merge that. This keeps the next victim from having to re-resolve > conflicts.
Sorry, Eric, I didn't even know there was a glean-imports branch. Feel free to revert my changes. I could re-do them on the glean-imports branch. -Brian ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
