diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 15:31:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 15:31:09 -0700 |
| commit | 1b856974617cb88202cdfe28bdcf43a939fa47be (patch) | |
| tree | 01510e0a1a51097e3c5b39de55563769d0c84a5f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a (diff) | |
| parent | 87b9055252687206cc9f561c9c33026b683465f2 (diff) | |
Merge change 22822 into eclair
* changes:
resolved conflicts for merge of b0f5b755 to eclair
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions