diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:20:40 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:20:40 +1100 |
| commit | 49405c43f245d3b3ddd12e891413bf7ead23145c (patch) | |
| tree | c6969454265b133f6be8c04b2ba193aecf90e4a7 /src/mesa/drivers/dri/intel_winsys/intel_context.h | |
| parent | 263de4b814eb78cc971ad28f173985b61b77465c (diff) | |
| parent | 4d9c19d2f7eef263b49485b6e65be9afbe58363a (diff) | |
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/nouveau/nouveau_stateobj.h
src/mesa/pipe/nv40/nv40_context.c
src/mesa/pipe/nv40/nv40_miptree.c
Diffstat (limited to 'src/mesa/drivers/dri/intel_winsys/intel_context.h')
0 files changed, 0 insertions, 0 deletions