| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 | [log] [tgz] |
|---|---|---|
| author | Michal Krol <michal@vmware.com> | Sat Dec 12 16:48:32 2009 +0100 |
| committer | Michal Krol <michal@vmware.com> | Sat Dec 12 16:48:32 2009 +0100 |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc [diff] | |
| parent | 784cca9fa527de771754d76545970f78094b9adf [diff] |
Merge branch 'master' into glsl-pp-rework-2 Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h