| commit | feb619b7705897ca723e8fe728f739932f743327 | [log] [tgz] |
|---|---|---|
| author | Michel Dänzer <daenzer@vmware.com> | Fri Mar 26 18:42:16 2010 +0100 |
| committer | Michel Dänzer <daenzer@vmware.com> | Fri Mar 26 18:42:16 2010 +0100 |
| tree | 9c972bf3d54efd9476233a17202124eac2ac4ae6 | |
| parent | 3ae082f00cad3f2323a3747fe3b6f02b8f8c5285 [diff] | |
| parent | 7996f0fc2c167c84552701be7a48d20a897e7978 [diff] |
Merge branch '7.8' Conflicts: src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master