chengstory 8ae7ecff33 Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h		2013-12-26 12:55:52 +08:00
..
cocosbuilder	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor	2013-12-20 21:12:11 +08:00
cocostudio	Merge branch 'develop' into #3457	2013-12-26 12:55:52 +08:00
spine	Some warning fixes.	2013-12-25 16:06:39 +08:00