samuele3hu 7198ae509c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-10-16 20:35:43 +08:00
..
project	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +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_new_spine	2014-10-16 20:35:43 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00