| commit | 650e02003fbb5511ec758d993b7ec0a302ee2235 | [log] [tgz] |
|---|---|---|
| author | Ian Romanick <ian.d.romanick@intel.com> | Mon Nov 30 17:47:07 2009 -0800 |
| committer | Ian Romanick <ian.d.romanick@intel.com> | Mon Nov 30 17:47:07 2009 -0800 |
| tree | 96ff849518962856e51b2e3a26b78ba008b2f9ad | |
| parent | 270d36da146b899d39e08f830fe34b63833a3731 [diff] | |
| parent | 587a52e95bbe96788e8b96b63f091bb3022fc048 [diff] |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h