mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
9f916841fe
Conflicts: templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj