Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins] watchdog
[Jenkins] watchdog
EditBox:fixes clip the text width to fit to the text box on Android and IOS.
[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-job-watchdog-threshold]replace[duration]
Merge pull request #15 from cocos2d/develop

update lua
find correct path on windows
Merge pull request #5763 from minggo/script-fix

find correct path on windows
add cocos-console-test.py to tools/jenkins-scripts/
update win32 templates
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
modify cocos-console-test.py.
Merge pull request #5765 from shujunqiao/develop

add cocos-console-test.py to tools/jenkins-scripts
Rename `testlua` to `lua_tests` for luaTest android project