| commit | 9b22427911ad27efc1f36faee9462c6082d0417c | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Mon Jan 25 14:46:17 2010 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Mon Jan 25 14:46:17 2010 -0700 |
| tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c | |
| parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 [diff] | |
| parent | 6749310d3f60df70ad8f82db986871ab9496793b [diff] |
Merge branch 'mesa_7_7_branch' Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c