diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 21:35:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 21:35:04 -0700 |
| commit | 67049ccc96f21ac7629a115f2ce82f3494b245ff (patch) | |
| tree | f19cb95e8746ff416d67cb2e2c5bd6d9ee4367a5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 34453aeefb3822010fac5eb5352b49141a331cf5 (diff) | |
| parent | 04bfa42078020de663747c9110a14c0529481fe6 (diff) | |
Merge change 21060
* changes:
resolved conflicts for merge of 6550076f to master
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions