diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-01 11:00:33 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-09-01 11:00:33 +0800 |
| commit | edf16716c86e6a6c4a0f7a8ff4f8e651822e0739 (patch) | |
| tree | 44bbf7b9195e3a502cf4adf9f1879703a0afc9f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f72648c7c41a3c0a724c14d259667bd4bbccaafe (diff) | |
| parent | 0945f0aa24dea711c6a0bcfaa64f1cc379a610f4 (diff) | |
resolved conflicts for merge of a329aef4 to master
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions