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 | 0256b71d8559d0b98824519fee0f3110214fe8fb (patch) | |
| tree | 3fc6b1b32b423189e48e86b91eda8d299b3fe6ec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5eb77d68b3db2d436f2809c9bb93dcc9c1d69e78 (diff) | |
| parent | cb60907a5afede491169939d7881689fd3c6d4cb (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