| commit | 3a3801c1431203fc4dca24d56577995ae2e78956 | [log] [tgz] |
|---|---|---|
| author | Keith Whitwell <keith@tungstengraphics.com> | Fri Oct 10 15:26:28 2008 +0100 |
| committer | Keith Whitwell <keith@tungstengraphics.com> | Fri Oct 10 15:26:28 2008 +0100 |
| tree | 7ec341b78ecc62dc1a238392aff828c363148d69 | |
| parent | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f [diff] | |
| parent | 7216679c1998b49ff5b08e6b43f8d5779415bf54 [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms