Merge branch 'master' into opengl-es-v2
authorChia-I Wu <olvaffe@gmail.com>
Tue, 12 Jan 2010 03:25:02 +0000 (11:25 +0800)
committerChia-I Wu <olvaffe@gmail.com>
Tue, 12 Jan 2010 03:25:02 +0000 (11:25 +0800)
commit562c127693200822f04a145db50add1be2425d7b
tree9441774fb212b17ddf2a364f06abc43f166cc00b
parente5d351dcfde58777162552cf5cd2a9cd8299f4cd
parent077d6dd7508af88509dd0499c5dfbdaa186b4015
Merge branch 'master' into opengl-es-v2

Conflicts:
src/mesa/main/dd.h
21 files changed:
Makefile
configure.ac
src/gallium/state_trackers/egl/egl_tracker.c
src/gallium/winsys/xlib/xlib.c
src/mesa/drivers/x11/glxapi.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glapi_getproc.c
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glthread.c
src/mesa/main/dd.h
src/mesa/main/dispatch.c
src/mesa/main/enums.c
src/mesa/main/extensions.c
src/mesa/main/getstring.c
src/mesa/main/mtypes.h
src/mesa/main/texgen.c
src/mesa/main/texgetimage.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_extensions.c
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S