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
[jenkins-watchdog]add the time of single job
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-watchdog]add the time of single job
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
Reverse CONSTRUCTOR_ACCESS to public
Fixed bugs for Editor
Add the omitted socket script for lua-tests
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Label ignore sort children.
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
Label ignore sort children.
Merge branch 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x into feature/fix_STRING_TEXTURE_label_sortAllChildren_crash

* 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x:
  Label ignore sort children.
  fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
Merge pull request #6057 from samuele3hu/develop_socket

Add the omitted socket script for lua-tests
fix box2d dynamic tree draws
Optimize the performance of BlurSpriteTest in Shader Sprite.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #6061 from natural-law/develop

Optimize the performance of BlurSpriteTest in Shader Sprite.