samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... nter # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2014-10-16 10:59:58 +08:00
..
xcshareddata/xcschemes	Adds missing xcshared data for missing projects	2014-09-05 14:32:14 -07:00
project.pbxproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-16 10:59:58 +08:00