Merge remote branch 'origin/opengl-es-v2'
authorChia-I Wu <olvaffe@gmail.com>
Wed, 20 Jan 2010 02:02:15 +0000 (10:02 +0800)
committerChia-I Wu <olvaffe@gmail.com>
Wed, 20 Jan 2010 02:02:15 +0000 (10:02 +0800)
1  2 
configure.ac
src/mesa/glapi/gl_XML.py
src/mesa/glapi/glapitemp.h
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_extensions.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge