replicant-frameworks_native/opengl
Mathias Agopian 7be3e5d2d8 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
..
include
libagl integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK. 2009-04-23 13:45:48 -07:00
libs Merge commit 'goog/master' into merge_master 2009-04-30 14:43:18 -07:00
tests
tools/glgen Enable static Java APIs for OpenGL ES 1.1 extensions. 2009-04-24 13:07:17 -07:00