James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding ... Conflicts: cocos/editor-support/cocostudio/TriggerMng.cpp		2013-12-30 21:06:57 +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' of git://github.com/cocos2d/cocos2d-x into ccs-binding	2013-12-30 21:06:57 +08:00
spine	Small fix for `FREE` wrong variable.	2013-12-28 14:38:13 +08:00