Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5821 from CocosRobot/update_cocosfiles_1394819251

[AUTO][ci skip]: updating cocos2dx_files.json
update submodule
Merge pull request #5824 from lihex/develop

update submodule
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
init Console variable
space
modify recv namelen array
rename variable
Merge pull request #5826 from chuanweizhang2013/cmdconsole

console variable init
[ci skip]
modify autotest.py for use mac app.
[jenkins-watchdog] int(os.environ['jenkins-job-watchdog-threshold'])replace os.environ['jenkins-job-watchdog-threshold']
Update the reference of submodule "cocos2d-console".
Merge pull request #5838 from natural-law/develop

Update the reference of submodule "cocos2d-console".
[jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password']
Merge pull request #5834 from shujunqiao/autotest

modify autotest.py for use mac app.