diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:27:20 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:27:20 -0400 |
| commit | 9b6911cb85a9c9a0fef145f91c9999da5a75ce21 (patch) | |
| tree | 1027bf4a0f4f816c846d8e364b90da8d24e053a4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 38a1081cad9385073d80d358decf04f6b2fd5723 (diff) | |
| parent | da0a56df963353a1f1bd1914fa31f870d982dd5a (diff) | |
Merge change 24630 into eclair
* changes:
resolved conflicts for merge of e0408aa1 to eclair
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions