diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-08-04 12:03:46 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@android.com> | 2010-08-04 12:03:46 -0700 |
| commit | 3b89f9bffc9a3147f95b34b9d997beb177b4aed7 (patch) | |
| tree | 30fbfeb62560c8503a6f8e32e9624c129f98c194 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 703f6aef51ab99cf70073ac2fe42a7431b2333b8 (diff) | |
| parent | f36edbf46bb855598050e2023f73dad7188e7d48 (diff) | |
resolved conflicts for merge of 10928c37 to master
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions