summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi/glapioffsets.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-09-09 08:33:39 -0600
committerBrian Paul <[email protected]>2009-09-09 08:33:39 -0600
commit0c309bb494b6ee1c403442d1207743f749f95b6e (patch)
treea3cb118c850ef4152312e81afdb7543f45ef2e3e /src/mesa/glapi/glapioffsets.h
parentc6c44bf48124dd5b4661014a8d58482c5a54557f (diff)
parentd27d659043bd7f2bd9a2636209f299cda0664230 (diff)
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts: Makefile configs/default progs/glsl/Makefile src/gallium/auxiliary/util/u_simple_shaders.c src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_pixel.c src/mesa/drivers/dri/intel/intel_pixel_read.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
Diffstat (limited to 'src/mesa/glapi/glapioffsets.h')
0 files changed, 0 insertions, 0 deletions