minggo 5c58a8224c Merge pull request #4168 from xhcnb/fix_ccb_nodeloader ... [ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...		2013-11-13 19:46:08 -08:00
..
cocosbuilder	Merge pull request #4168 from xhcnb/fix_ccb_nodeloader	2013-11-13 19:46:08 -08:00
cocostudio	Merge pull request #4206 from boyu0/iss2770_fix_warnings	2013-11-13 17:57:25 -08:00
spine	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings	2013-11-12 10:07:26 +08:00