kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp		2014-12-22 11:14:31 +08:00
..
project	Remove useless copy about luasocket on the android platform	2014-12-05 15:28:45 +08:00
res/cocosbuilderRes	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-22 11:14:31 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00