mirror of https://github.com/axmolengine/axmol.git
3ee17b1a23
there was no actual conflict, so only a dot was added to the comment so git would accept the commit (otherwise "nothing to commit"); and thus the history is preserved. |
||
|---|---|---|
| .. | ||
| GL | ||
| CMakeLists.txt | ||
| ChangeLog | ||
| aabb.c | ||
| mat3.c | ||
| mat4.c | ||
| neon_matrix_impl.c | ||
| plane.c | ||
| quaternion.c | ||
| ray2.c | ||
| utility.c | ||
| vec2.c | ||
| vec3.c | ||
| vec4.c | ||