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
..
EGL	Merge commit 'goog/master' into merge_master	2009-04-30 14:43:18 -07:00
GLES_CM	Merge commit 'goog/master' into merge_master	2009-04-30 14:43:18 -07:00
tools	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
Android.mk	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
egl_entries.in	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
egl_impl.h	Integrate from //sandbox/mathias/donut/...@145728	2009-04-10 14:24:30 -07:00
gl_entries.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_enums.in	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
glext_entries.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
hooks.h	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