samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-10-16 16:04:09 +08:00
..
cocosbuilder	removed old WP8 project files	2014-10-14 14:09:52 -07:00
cocostudio	Merge pull request #8712 from pipu/v3_modify_warning_of_reader	2014-10-16 12:03:59 +08:00
spine	Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine	2014-10-16 16:04:09 +08:00