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.
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
fixed PhysicsBody::setAngularVelocityLimit incorrect function call
Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize

Conflicts:
	cocos/2d/cocos2d_wp8.vcxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash

closed #4626: Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
[AUTO]: updating luabinding automatically
Merge pull request #6083 from CocosRobot/update_lua_bindings_1396318132

[AUTO]: updating luabinding automatically