mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release
# Conflicts: # cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
This commit is contained in:
Submodule native/tools/bindings-generator updated: 0765f4d13c...6b750dd800
Reference in New Issue
Block a user