diff options
| author | Justin Ho <justinho@google.com> | 2011-10-03 17:06:26 -0700 |
|---|---|---|
| committer | Justin Ho <justinho@google.com> | 2011-10-03 17:06:26 -0700 |
| commit | eb53548f9ab0775c94512cec6238fb6c36d5aba1 (patch) | |
| tree | e3d0267c2cdbcae5b5efd9404c69fe1ecaa84583 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a030b2ba7c9a4a52a9d7d03c5240f9dff80d1759 (diff) | |
| parent | e7bbe540128d923fb177a627fcba7674e0b9f79b (diff) | |
Resolve conflicts for merge 121e805a to master
Conflicts:
CleanSpec.mk
Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions