summaryrefslogtreecommitdiff
path: root/src/gallium/docs
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2010-03-16 09:02:38 +0000
committerKeith Whitwell <keithw@vmware.com>2010-03-16 09:02:38 +0000
commit8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch)
tree087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/docs
parent6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff)
parente0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff)
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix. Conflicts: src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/docs')
0 files changed, 0 insertions, 0 deletions