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 |
||
---|---|---|
.. | ||
Application-mac.h | ||
Application-mac.mm | ||
Common-mac.mm | ||
Device-mac.mm | ||
GL-mac.h | ||
PlatformDefine-mac.h | ||
StdC-mac.h | ||
cocos2d-prefix.pch |