diff options
| author | Christoph Bumiller <[email protected]> | 2010-09-15 17:34:40 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-09-15 17:34:40 +0200 |
| commit | 26fe16a99b762d27e8f499c2e02116e9c4b7a6bb (patch) | |
| tree | 153d15f0e24f349d2ba6ec736ed5e4b8b961e824 /src/glsl/main.cpp | |
| parent | 59ca1ae84b2c15c8a94211da158f563e45560bcd (diff) | |
| parent | 84d170bbcef8e26017ac8e2f3bacbaeb20f889d3 (diff) | |
Merge remote branch 'origin/nv50-compiler'
Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
Diffstat (limited to 'src/glsl/main.cpp')
0 files changed, 0 insertions, 0 deletions