| commit | e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Mon May 11 16:27:50 2009 -0600 |
| committer | Brian Paul <brianp@vmware.com> | Mon May 11 16:27:50 2009 -0600 |
| tree | b47a363853d2ed59184c3b9eb72ccb30d00cbebf | |
| parent | 783e43064b64feb87e0457f96c2275160389f84c [diff] | |
| parent | f104e4d666dfccda6f5ad817693216733ddede44 [diff] |
Merge branch 'mesa_7_5_branch' Conflicts: Makefile src/mesa/main/version.h