Fixed bug of scrollview
Fixed bugs.
Merge branch 'master' into master_nutty_modify_framework_modifyluapkg
Fixed bug of reader.
Fixed bugs.
Fixed bug of reader.
Fixed bugs of copying layout parameter
Add copy method to LayoutParameter
Merge branch 'master' into master_nutty_modify_framework_modifyluapkg
Fixed bug of label
Merge branch 'master' into master_nutty_modify_framework_addlayoutparameterclone
Optimize scissor clipping
Merge branch 'master' into master_nutty_modify_framework_addlayoutparameterclone
fixed playByIndex lack param
closed #4070, Add method to reload cached texture & update the nodes used the texture.
closed #4070, Solve the compile error on android.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Add methods for editor
Merge branch 'master' into master_nutty_modify_framework_addlayoutparameterclone
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x