diff options
| author | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
| commit | 7bece1a6625bd3007738fbf2014370a2d44bd2c0 (patch) | |
| tree | fa2b133be43a0eb36fb205669b9996b9fa945f1f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5488aceda261f8e13febc2c4d4f2cd553bfc95e9 (diff) | |
| parent | 8fcb0044238afb08598ac30ce299758f906de9f0 (diff) | |
resolved conflicts for merge of 965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions