minggo 1552345596 Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2
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
2022-01-24 15:01:01 +08:00
S
Description
No description provided
MIT 361 MiB
Languages
C++ 50.7%
TypeScript 35.1%
JavaScript 4%
C 4%
Objective-C++ 1.7%
Other 4.4%