diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-23 14:59:58 +0800 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2010-09-23 14:59:58 +0800 |
| commit | a6e71deb3f61108a02129e9a4533cf65de6aa122 (patch) | |
| tree | 653b565a6456c6bc28c77296b7401614aaf2fc2e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 913c0bbdb1155a1678b33cd51649fe801a77419b (diff) | |
| parent | cefce2967ebdcb408f33f0132f44edab42268f02 (diff) | |
resolved conflicts for merge of 2b652855 to master
Change-Id: I3604c95530823605d66cb56be7a37c55399a9271
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions