diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-21 01:42:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-21 01:42:43 -0800 |
| commit | 6c9e7f47d34763202a122713d5a300df58cbfcec (patch) | |
| tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c9c6dd33b3bda75640dc1d7bfd9efa9525cada5a (diff) | |
| parent | a1c2e5d0bc289fdd4aa05b0aebc5ef3cc42958ee (diff) | |
Merge change I66a4a6e4
* changes:
Fix merge conflict markers that accidentally got checked in.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions