James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2013-12-23 20:28:51 +08:00
..
Classes	spine simple JS binding supported	2013-12-20 16:10:15 +09:00
Resources	rename jsb boot file.	2013-11-07 23:51:01 +08:00
proj.android	Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test	2013-12-23 20:28:51 +08:00
proj.ios_mac	Hot fix:Repair js template copy resource error	2013-11-18 23:08:37 +08:00
proj.win32	issue #2826: Updating vs project to link mozjs-25.lib	2013-10-31 11:24:43 +08:00