summaryrefslogtreecommitdiff
path: root/libs/utils/StringArray.cpp
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2013-04-16 14:31:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-04-16 14:31:17 -0700
commit29bdde08db2890f4197ae7f2b253f251468980ab (patch)
treec8bbeb8cf03288f985095752b9223dfc1458eb13 /libs/utils/StringArray.cpp
parent987f727da2f90d428ae773a58cafc4ea67737aab (diff)
parent2f67faeb801dd6eb8fff8f8aab3843f2532c941d (diff)
am 2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* commit '2f67faeb801dd6eb8fff8f8aab3843f2532c941d': Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX Special-case glGetActiveUniformBlockName Special-case glGetStringi Special-case glMapBufferRange Special-case glGetBufferPointerv Special-case glGetUniformIndices Special-case glGetTransformFeedbackVarying Special-case glTransformFeedbackVaryings Add buffer object versions of several functions Add *int64 and GLsync types and related functions Add ES3 functions and constants, difficult ones commented out Support "const GLChar*" and "const GLenum*" types Minor changes to ES3 functions inherited from ES2 Generate GLES30 class, just a clone of GLES20 for now
Diffstat (limited to 'libs/utils/StringArray.cpp')
0 files changed, 0 insertions, 0 deletions