mirror of https://github.com/axmolengine/axmol.git
449a596f3e
Merge branch '1.x' into dev # Conflicts: # README.md # README_CN.md # install-pwsh.sh # tools/console/axmol |
||
---|---|---|
.. | ||
jni | ||
res | ||
src/org/axmol/lua | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle | ||
get_environment.sh | ||
proguard-rules.pro |