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 |
||
---|---|---|
.. | ||
AssetsManager.cpp | ||
AssetsManager.h | ||
AssetsManagerEx.cpp | ||
AssetsManagerEx.h | ||
CMakeLists.txt | ||
EventAssetsManagerEx.cpp | ||
EventAssetsManagerEx.h | ||
EventListenerAssetsManagerEx.cpp | ||
EventListenerAssetsManagerEx.h | ||
Manifest.cpp | ||
Manifest.h |