| commit | d2f6d6ce49699d35d6b6a234fe17a27d99f4b267 | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Tue Jul 28 08:58:25 2009 -0600 |
| committer | Brian Paul <brianp@vmware.com> | Tue Jul 28 08:58:25 2009 -0600 |
| tree | 22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa | |
| parent | 94726bc69e5f9dbefb34a38695f2f51d81ff433f [diff] | |
| parent | bc60b884110b9e41ee3082075717587cc38380b5 [diff] |
Merge branch 'mesa_7_5_branch' Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h