Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 ... # Conflicts: # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-06-17 13:04:24 +08:00
..
xcshareddata/xcschemes	Ouch. DEBUG instead of RELEASE for Build on Xcode	2014-11-27 10:54:09 -08:00
project.pbxproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2	2015-06-17 13:04:24 +08:00