[Mesa-dev] Merge of glsl2 branch to master

[José Fonseca]

On Fri, 2010-08-13 at 20:40 -0700, Ian Romanick wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Ian Romanick wrote:
> > I propose that we merge master to glsl2 on *Friday, August 13th* (one
> > week from today).  Barring unforeseen issues, I propose that we merge
> > glsl2 to master on *Monday, August 16th*.
> 
> The master -> glsl2 merge is complete.  There don't appear to be any
> regressions in the glsl2 branch caused by the merge.  My plan is to
> merge glsl2 -> master on Monday evening, pacific time.  There are still
> three build issues with MSVC.  All three either have patches or a
> proposed fix.
>
> I've been working on this for almost 12 hours today, so I'm not going to
> post the combinations of test results that I usually post.  Sorry.

Ian,

Thanks for all your diligence with Windows portability. There are still
some issues with MSVC but it's pretty minor stuff (e.g log2f & exp2f). I
can get to it the next couple of days, so feel free to merge as far as
I'm concerned.

Jose