projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2432ca1 65b024d)
Merge branch 'arb_sampler_objects'
authorBrian Paul <brianp@vmware.com>
Tue, 12 Apr 2011 03:19:41 +0000 (21:19 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 12 Apr 2011 03:19:41 +0000 (21:19 -0600)

Trivial merge