| commit | 2cf5fd48d1586f961910a14324a457854cb66221 | [log] [tgz] |
|---|---|---|
| author | Brian <brian@yutani.localnet.net> | Fri Mar 09 11:43:53 2007 -0700 |
| committer | Brian <brian@yutani.localnet.net> | Fri Mar 09 11:43:53 2007 -0700 |
| tree | 6b8690b1e3ac2b59369356d692214cc7d6a889c6 | |
| parent | 9f44247acf62b91669f77974a4bbad687d58859e [diff] | |
| parent | f9f79c8d770e696249bd98c68b563f887562c974 [diff] |
Merge branch 'origin' into glsl-compiler-1 Conflicts: src/mesa/main/context.c