Module: Mesa Branch: master Commit: 1ca55854591d647a485364c2db67899e7f9aaae1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ca55854591d647a485364c2db67899e7f9aaae1 Author: Brian Paul <brianp at vmware.com> Date: Mon Apr 11 21:19:41 2011 -0600 Merge branch 'arb_sampler_objects' ---