Merge branch 'gallium-conditional-rendering'
authorBrian Paul <brianp@vmware.com>
Mon, 4 Jan 2010 18:47:39 +0000 (11:47 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 4 Jan 2010 18:47:39 +0000 (11:47 -0700)
commit0fb1eaddfbaf487067e0ff4f1d6f82145b6b0acd
tree0f3f0239f09d5681e38a474259e018ba34a160a2
parent195568e4cb0524d71db0ac68cf5a95b33a1af6b4
parentc9b558351847133dced0c9daaeb84d57d550afc9
Merge branch 'gallium-conditional-rendering'