wangshuai 3aaa18f7f4 Merge branch 'master' into iss1425-lua ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-03-06 20:39:01 +08:00
..
cxx-generator@ff1bd686c8	Updated the submodule reference of cxx-generator.	2013-02-27 15:17:19 +08:00
jenkins_scripts	fixed the failure of auto generating js binding.	2013-02-20 11:07:42 +08:00
lua_project_generator	CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.	2013-01-29 10:40:44 +08:00
project-creator	issue #1733, fix a typo in dumping usage.	2013-02-22 22:24:05 +08:00
tojs	Updated cocos2dx.ini.	2013-03-01 10:58:16 +08:00
tolua++	Merge branch 'master' into iss1425-lua	2013-03-06 20:39:01 +08:00
xcode4_template_generator	issue #1687: Updating iOS template after refactoring CCFileUtils.	2013-02-03 13:56:44 +08:00