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
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
Reverse CONSTRUCTOR_ACCESS to public
Fixed bugs for Editor
Solve the error effect of BlurSpriteTest in Shader Sprite.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Update the font size for new label test display
fix cmake win32 project generation
added missing variadicCreate for wp8
intialize _hasMipmaps to false in constructor
fixed reserved word DELETE in wp8 compiler
can't close app on WP8
use ResolutionPolicy::SHOW_ALL on WP8
added wp8 build files
added external libs for wp8