| commit | c95cbd45c657ac47e908a4d99d118737034bde43 | [log] [tgz] |
|---|---|---|
| author | Roland Scheidegger <sroland@vmware.com> | Fri Nov 27 17:15:47 2009 +0100 |
| committer | Roland Scheidegger <sroland@vmware.com> | Fri Nov 27 17:15:47 2009 +0100 |
| tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf | |
| parent | 884007546c98b1779bf266ec5111b1e7e2b68b2e [diff] | |
| parent | d509f84543d0979e9bb53c20c195f378dd61e728 [diff] |
Merge branch 'width0' Conflicts: src/gallium/drivers/r300/r300_texture.c src/gallium/state_trackers/xorg/xorg_exa.c src/mesa/state_tracker/st_cb_texture.c