| commit | afe125e0a18ac3886c45c7e6b02b122fb2d327b5 | [log] [tgz] |
|---|---|---|
| author | Eric Anholt <eric@anholt.net> | Mon Jul 26 17:47:59 2010 -0700 |
| committer | Eric Anholt <eric@anholt.net> | Mon Jul 26 17:53:27 2010 -0700 |
| tree | 78621707e71154c0b388b0baacffc26432b7e992 | |
| parent | d64343f1ae84979bd154475badf11af8a9bfc2eb [diff] | |
| parent | 5403ca79b225605c79f49866a6497c97da53be3b [diff] |
Merge remote branch 'origin/master' into glsl2 This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h