[Mesa-dev] Merge of glsl2 branch to master

[Ian Romanick]

-----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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxmED4ACgkQX1gOwKyEAw9yggCfeSZnpp8IMeZefx593gjJwLAj
AUcAn3L70Z1Yfjck8WVzQOCLQ8J/OGU5
=C84g
-----END PGP SIGNATURE-----