diff options
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-08-12 12:01:35 -0700 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-08-12 12:01:35 -0700 |
| commit | 45e503ae91d380ebe5158927b7d6aa80e166d096 (patch) | |
| tree | 6c0b3411d101ad0d5b4518ebf4e313a7d7686dec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4547962a95359f1d390b9cbb7459789391e86089 (diff) | |
| parent | 802527c6a8a91f7da72f2ce9f6cb3cc342582127 (diff) | |
resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as pre Bob
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions