diff options
| author | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-08-18 22:31:43 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-08-18 22:31:43 +0200 |
| commit | 4b4fc25c3fab92bf292a78cb9c16a5a32a8bb01b (patch) | |
| tree | a7fb45a41c6558a3304210fd72cf211258996dbc /src/glut/mini | |
| parent | 7aefdd518578687f961bb512a2b408857f0b9824 (diff) | |
| parent | 53cf87be1b93c760228e6a9af8115d2a9ff99337 (diff) | |
Merge branch 'origin' into i915tex_privbuffersi915tex_privbuffers
Conflicts:
src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
src/mesa/drivers/dri/nouveau/nouveau_buffers.c
src/mesa/main/buffers.c
src/mesa/main/buffers.h
src/mesa/main/fbobject.c
src/mesa/main/framebuffer.c
Diffstat (limited to 'src/glut/mini')
0 files changed, 0 insertions, 0 deletions