James Chen 190e6c1de5 Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2012-12-10 17:25:23 +08:00
..
cxx-generator@ab8a6c0823	fix a type information in CCBAnimationManager	2012-12-10 11:30:07 +08:00
jenkins_scripts	Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.	2012-10-30 17:54:48 +08:00
lua_project_generator	issue #1565: Removed VS2008 support.	2012-11-19 14:42:27 +08:00
tojs	Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests	2012-11-30 21:43:44 +08:00
tolua++	Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux	2012-12-10 17:25:23 +08:00
xcode4_template_generator	when user specified 'group' parameter, it should be parsed as an 'int'	2012-11-27 15:11:43 +08:00