| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 | |
| author | Keith Whitwell <keithw@vmware.com> | |
| Tue, 16 Mar 2010 09:02:38 +0000 (16 09:02 +0000) | ||
| committer | Keith Whitwell <keithw@vmware.com> | |
| Tue, 16 Mar 2010 09:02:38 +0000 (16 09:02 +0000) | ||
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 | treesnapshot (tar.gz zip) |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 | commitdiff |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 | commitdiff |
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
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c