Mathias Agopian fa6eda01a9 Merge commit 'goog/master' into merge_master ...

Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen

2009-04-30 14:43:18 -07:00

..

gl_api.in

use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.

2009-04-23 18:05:44 -07:00

gl.cpp

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

glext_api.in

use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.

2009-04-23 18:05:44 -07:00