Merge commit 'origin/master' into gallium-sampler-view
[mesa.git] / src / gallium / drivers / nvfx / nvfx_query.c
2010-03-15 Keith WhitwellMerge commit 'origin/master' into gallium-sampler-view
2010-03-15 Luca Barbierinv30, nv40: unify nv[34]0_query.c