diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-01 13:57:04 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-01 13:57:04 -0700 |
| commit | e9f1281c74e87e9f39b687835c1bc5d9c60aa725 (patch) | |
| tree | 1f0d342cbed2ea50622e9a4e941d45ace6afca65 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 30903b5e20d31771ed1d04d26a314ff3f19fba07 (diff) | |
| parent | 9562f7abcabce7f7dc0a6ec65310c0d9d81a4d63 (diff) | |
resolved conflicts for merge of 6718b365 to master
Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions