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
Reverse CONSTRUCTOR_ACCESS to public
closed #4383: Fixed missing letters if using old LabelTTF and running on
iphone 64bit simulator(device).
fonts/xxx.ttf -> Xxx for old LabelTTF test.
Label:fixed possible appear OpenGL error 0x500.
Renames s_isIOS7 to s_isIOS7OrHigher
remove unused local variable.
Merge pull request #6090 from dumganhar/iss4383-label-missing-letters

closed #4383: Fixed missing letters if using old LabelTTF and running on  iPhone 64bit simulator(device).
Merge pull request #6091 from Dhilan007/develop_label

Label:fixed possible appear OpenGL error 0x500.
Update CHANGELOG [ci skip]
fix autotest infinite loop
Merge pull request #6092 from heliclei/fix-autotest

Fix autotest infinite loop
Updates templates for linux platform
Merge pull request #6094 from dumganhar/develop

Updates templates for linux platform
modify samples of ShaderTest.cpp for autotest.py.