diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:27:20 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 21:27:20 -0400 |
| commit | d6594f7d38fc73838f8b25dab574a54e57972445 (patch) | |
| tree | 5a9247f35f2ba7be849680bf24f655f578bc6109 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 09c5013b43d0bd1e96fd67d56ca2ffa1bc8e07f9 (diff) | |
| parent | 1b188d7c9675616a85709674a4eaaa1db325a7ea (diff) | |
Merge change 24630 into eclair
* changes:
resolved conflicts for merge of e0408aa1 to eclair
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions