mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 15:42:39 +08:00
1552345596
Conflicts: cocos/platform/android/jni/JniCocosActivity.cpp cocos/platform/apple/JsbBridgeWrapper.mm cocos/platform/ohos/jni/JniCocosAbility.cpp cocos/renderer/gfx-metal/MTLCommandBuffer.mm external/config.json