mirror of https://github.com/axmolengine/axmol.git
Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate
Conflicts: Emscripten.TODO cocos2dx/proj.emscripten/cocos2dx.mk external/chipmunk/proj.emscripten/Makefile samples/Cpp/TestCpp/proj.emscripten/Makefile
This commit is contained in:
commit
737d51a05b