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
..
Cpp	update vs project for remove CCCamera.	2013-12-22 17:19:59 +08:00
Javascript	Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test	2013-12-23 20:28:51 +08:00
Lua	issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info	2013-12-23 11:19:55 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00