samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj cocos/scripting/lua-bindings/Android.mk cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj tools/tolua/genbindings.py		2014-07-10 22:42:09 +08:00
..
lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller	2014-07-10 22:42:09 +08:00