remove the float type "f" postfix in /simple_shadow.frag
Merge pull request #184 from tangziwen/v3

remove the float type "f" postfix in /simple_shadow.frag
[AUTO]: updating luabinding automatically
do not try to load empty texture
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
performance improve
Merge pull request #9596 from minggo/use-auto-reference

performance improve
Merge pull request #9595 from super626/v3

Do not try to load empty texture
Merge pull request #9593 from CocosRobot/update_lua_bindings_1419317247

[AUTO]: updating luabinding automatically
fix allocator related compile error on wp8/8.1 and winrt
Merge pull request #9600 from huangshiwu/v3_allocator_wp

fix allocator related compile error on wp8/8.1 and winrt
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader

Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters

resolve the conflicts