diff options
| author | Jack Palevich <jackpal@google.com> | 2009-12-21 17:39:58 +0800 |
|---|---|---|
| committer | Jack Palevich <jackpal@google.com> | 2009-12-21 17:39:58 +0800 |
| commit | 66a4a6e45f59f72f24d710221c27db1bd233e154 (patch) | |
| tree | 21a1f118bd5b11596df872825390acde373c7e8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 21799450ec751fd3c41c7e66e69fefb094b3050b (diff) | |
Fix merge conflict markers that accidentally got checked in.
(They were in a comment, so it wasn't detected by the compiler.)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions