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
Label ignore sort children.
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
Label ignore sort children.
Merge branch 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x into feature/fix_STRING_TEXTURE_label_sortAllChildren_crash

* 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x:
  Label ignore sort children.
  fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
use xxhash to generate material id
add xxhash on linux
use xxhash in win32 and wp8
Merge pull request #15 from koowolf/quadcommand-optimize

use xxhash in win32 and wp8
1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.
use xxhash in win32 and wp8
fix the lua template error that would lead to crash when do rotate
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket