samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820 ... Conflicts: cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp		2015-01-14 13:58:12 +08:00
..
cpp-empty-test	fix libpng warning	2014-12-27 20:47:59 +08:00
cpp-tests	Merge branch 'v3' into v3_AddOptionsForCulling	2015-01-14 12:44:24 +08:00
game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-empty-test	Remove useless copy about luasocket on the android platform	2014-12-05 15:28:45 +08:00
lua-game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-tests	issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes	2015-01-14 13:51:09 +08:00