James Chen 15d02e4db8 Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests ... Conflicts: scripting/javascript/bindings/cocos2d_specifics.cpp		2012-11-30 21:43:44 +08:00
..
cxx-generator@e4761d02b3	Bind some functions for js:	2012-11-28 11:49:20 +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++	make lua work	2012-11-23 10:36:26 +08:00
xcode4_template_generator	use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok	2012-11-26 15:08:40 +08:00