diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-10 15:17:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-10 15:17:33 -0700 |
| commit | 0e6a5c5c7f48984c6690136e1a22df66dcadad07 (patch) | |
| tree | 673307f1ea1fba45cd0a8205309ce9fb91f11538 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2be78efbe59e12b3bcb97a8b72839b84991f90aa (diff) | |
| parent | 839a2b73af3dcf0f2d0c30fb967fc0bef947be61 (diff) | |
Merge change 6827
* changes:
resolved conflicts for merge of ad94a983 to master
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions