diff options
| author | repo sync <chiachi@android.com> | 2010-09-03 00:24:26 +0800 |
|---|---|---|
| committer | repo sync <chiachi@android.com> | 2010-09-03 00:24:26 +0800 |
| commit | fa0adc72d6fd9afe048c4c3e9cf95e6fd824f903 (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 90aa8ffda1ec6fcdd9413dc1e06091e64c431a76 (diff) | |
| parent | d764bb7a4b3d7841dbe860818444bfc4d35742a1 (diff) | |
resolved conflicts for merge of 12eaf9d5 to master
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions