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 |
||
---|---|---|
.. | ||
cpp-tests | ||
fairygui-tests | ||
live2d-tests | ||
lua-tests | ||
.gitignore |