repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
fix PhysicsShapeEdgeChain::init() always return false
fixed set blend func
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
[Jenkins][ci skip]: Monitor jenkins queue build
[Jenkins][ci skip]: Fix call method
Merge pull request #6128 from lmskater/monitor-queue-build

[Jenkins][ci skip]: Monitor jenkins queue build
Merge pull request #6129 from samuele3hu/develop_new_label

Synchronize LabelTest of cpp to lua to fix some bug and add more tests
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
remove cc prefix
Merge pull request #6122 from mgcL/PhysicsShapeEdgeChain-create-failed

fix PhysicsShapeEdgeChain::init() always return false
Update CHANGELOG [ci skip]
Merge pull request #6125 from 2youyouo2/develop

Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label