Jean-Baptiste Queru 3d7ab176d6 resolved conflicts for merge of f601ce2c to master ...

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7

2010-07-02 07:46:21 -07:00

..

angeles

…

fillrate

…

filter

…

finish

…

gl2_basic

update EGL headers to the latest

2010-06-09 18:56:05 -07:00

gl2_java

Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context

2009-11-19 19:08:52 +08:00

gl2_jni

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

gl_basic

update EGL headers to the latest

2010-06-09 18:56:05 -07:00

gl_jni

Fix missing NL

2010-06-25 09:08:12 -07:00

gldual

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

gralloc

…

lighting1709

…

linetex

…

swapinterval

…

testPauseResume

Add a test of EGL pausing and resuming.

2010-03-29 12:16:55 -07:00

testViewport

Declare that testViewport targets Froyo APIs

2010-04-29 18:45:11 +08:00

textures

…

tritex

…

Android.mk

…