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
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
closed #4557: Comment fixes in CCEventListener.h.
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
issue #4557: Adds const for `EventListener::isEnabeld`.
fix the error about `draw` of GLNode and modify the related test cases
issue #4557: Updates comments for EventListener::setEnabled/setPaused.
Also does whitespace cleanup and untabify codes. Thanks emacs. :)
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
issue #4557: Updates comments for EventListener::setPaused.
Merge pull request #6133 from samuele3hu/develop_new_label

fix the error about `draw` of GLNode and modify the related test cases
[AUTO][ci skip]: updating cocos2dx_files.json