| commit | 3293bcdc80cdfa20a2381aae2b94505bdf95d857 | [log] [tgz] |
|---|---|---|
| author | Roland Scheidegger <sroland@vmware.com> | Fri May 21 20:02:22 2010 +0200 |
| committer | Roland Scheidegger <sroland@vmware.com> | Fri May 21 20:02:22 2010 +0200 |
| tree | 16ab1ae66010f6d8b1325dbfa9006126a8e95771 | |
| parent | 8504c5d931e47765a15fdaec2df2cb6502a1bd5c [diff] | |
| parent | ce65caba846b03b5ef4144e311b85cfd48ab9bbb [diff] |
Merge branch 'gallium-msaa' Conflicts: src/mesa/state_tracker/st_gen_mipmap.c src/mesa/state_tracker/st_texture.c