| commit | 7e1bb6da489d825eb7d74d591a17dc40e97c3cd9 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 16 15:17:55 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 16 15:17:55 2009 -0700 |
| tree | bca0e25431d453f2468370585cc7ed095677acb6 | |
| parent | bd081ebd0c75b31e6e3a87b234a03253bfa27cce [diff] | |
| parent | b2fb847ff443c1dd5ac09d2ef02bf14cc09580a1 [diff] |
Merge change 7587 * changes: Fixes merge conflict.
diff --git a/opengl/libagl/primitives.cpp b/opengl/libagl/primitives.cpp index f164c02..769ec40 100644 --- a/opengl/libagl/primitives.cpp +++ b/opengl/libagl/primitives.cpp
@@ -369,7 +369,7 @@ int32_t c0, int32_t c1, int32_t c2) const { int64_t it64[3]; - iterators0032(it, c0, c1, c2); + iterators0032(it64, c0, c1, c2); it[0] = it64[0]; it[1] = it64[1]; it[2] = it64[2];