diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 14:21:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 14:21:23 -0700 |
| commit | 12cf346bb98a18b96cd3b2ae1cc587cbecd09f5a (patch) | |
| tree | 74ae309408f4e1e7916cbeba037a87d7da62ecd3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3d38870a65950a664d5a4f9e8b767502b839ceb8 (diff) | |
| parent | 5d7126b625c8c4a7b945e8c247b63abff7bc13b6 (diff) | |
Merge change 8858
* changes:
resolved conflicts for merge of ac38dfc5 to master
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions