diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 15:31:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-26 15:31:09 -0700 |
| commit | b486ae5c724dde2d1a04238b1e54e2bd80a57ec9 (patch) | |
| tree | b38dd00e41613f1a80e22d6e403d21b7d6fec136 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 63723266d3baa080cc372fbbb2a62800beee2314 (diff) | |
| parent | 624d35d2541b112cc0f8041c9e3bf0752e7e1210 (diff) | |
Merge change 22822 into eclair
* changes:
resolved conflicts for merge of b0f5b755 to eclair
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions