Michael Wright de83ff24b8 Merge "Fix conditional for glClear call"

2013-10-16 21:09:18 +00:00

..

java

Merge "Fix conditional for glClear call"

2013-10-16 21:09:18 +00:00

jni

am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:19:52 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-10-16 00:44:32 +00:00

tests

…