mirror of https://github.com/axmolengine/axmol.git
c20a067799
Conflicts: plugin/protocols/platform/android/PluginFactory.cpp plugin/protocols/proj.android/jni/Android.mk |
||
---|---|---|
.. | ||
Android.mk | ||
Application.mk |