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
Updates templates for linux platform
Merge pull request #6094 from dumganhar/develop

Updates templates for linux platform
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6095 from samuele3hu/develop_socket

update android-build.py for copying files about lua
Android crash fix on new devices
[ci skip]
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Fixed copying resource fails in empty-lua-test.
Merge pull request #6099 from dumganhar/develop

Fixed copying resource fails in empty-lua-test.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py
[ci skip]auto detect android device ip via adb command