Mathias Agopian 11abc8a36d Merge commit 'goog/master' into merge_master ...

Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h

2009-05-14 22:44:23 -07:00

..

egl.h

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

gl.h

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

glext.h

remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h

2009-05-08 17:18:55 -07:00

glplatform.h

Integrate from //sandbox/mathias/donut/...@145728

2009-04-10 14:24:30 -07:00