| commit | c789bd376f09c3b61617aeef6f5adbba2c541178 | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Tue Dec 30 18:01:15 2008 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Tue Dec 30 18:01:15 2008 -0700 |
| tree | b50aba807e609ef6084e52d814370a2cc761f1c8 | |
| parent | 369115e4c7a2985d880951fd8248deefa92025dd [diff] | |
| parent | e8d7db31e2a6784c765911233cb3d888f612837f [diff] |
Merge commit 'origin/master' into gallium-0.2 Conflicts: src/mesa/main/config.h