| commit | 898de4a9d5e47ed32c600e5907476fd9338aa7e9 | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Wed Nov 04 17:57:20 2009 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Wed Nov 04 17:57:20 2009 -0700 |
| tree | b06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec | |
| parent | fe86f8d73268785b31bc8d5a278a233bff42034d [diff] | |
| parent | 1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 [diff] |
Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/drivers/windows/gdi/mesa.def