diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2010-07-16 11:21:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-16 11:21:00 -0700 |
| commit | 365fb13fa3ff127d94304ac6cf2d582f0de1d556 (patch) | |
| tree | 865001488b1da7c62d1ba9e864e0a7716d743674 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 615679f97f269da0190e9411d0918e50747395f8 (diff) | |
| parent | 6058d36e4c3eb1cd45dff1693c25f68004368205 (diff) | |
Merge "Resolving a field naming conflict caused by the table join."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
