Merge branch 'glsl-1.20-v2'
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 01:25:43 +0000 (18:25 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 01:25:43 +0000 (18:25 -0700)
commitec8cdc71132be178c1588c9cffc184c2b4227b14
tree659d4fe3872c859dad360ec7b714c7ee5d6a88c4
parent63fc119d6c4f300958768144bd2a944e61c33eeb
parent4561307a27e07e37319fdf993c37f2c1b85ee3e9
Merge branch 'glsl-1.20-v2'