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
Merge pull request #16 from cocos2d/develop

update engine
add prebuilt runtime
update template
update res path
Merge pull request #17 from cocos2d/develop

update coco2d-x
update lua debugger
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage

Conflicts:
	templates/lua-template-runtime/src/main.lua
update win32 prebuilt
release c++ compile
modify recv namelen array
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
Merge branch 'cmdconsole' into luamerage
update prebuilt
add send \n
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
add win32
update release writepath