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
[AUTO]: updating luabinding automatically
Add ignored `Makefile` file for building luajit
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
use xxhash in win32 and wp8
Merge pull request #15 from koowolf/quadcommand-optimize

use xxhash in win32 and wp8
Merge pull request #6070 from CocosRobot/update_lua_bindings_1396255857

[AUTO]: updating luabinding automatically
fixed warn in test case.
fixed warn.
Merge pull request #6074 from samuele3hu/develop_socket

Add ignored `Makefile` file for building luajit
update test case.
Merge pull request #6075 from Dhilan007/develop_label

fixed warnings in LabelTest.
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6076 from CocosRobot/update_cocosfiles_1396259549

[AUTO][ci skip]: updating cocos2dx_files.json