| commit | 374cf77b2f0f13f9380fb0c9d804222a83bdc2e0 | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Tue Jan 06 08:15:54 2009 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Tue Jan 06 08:15:54 2009 -0700 |
| tree | 39cfbbcbbbdc9b2d64e4ad134472cf747101dc7b | |
| parent | 52d5d25537a9291f7d247211d2881ed56edaca94 [diff] | |
| parent | a8ee35c1c59c23938e0a18b163515acc892ed407 [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: src/mesa/drivers/dri/common/dri_util.c