James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test ... Conflicts: cocos/scripting/auto-generated		2013-12-27 20:18:58 +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 commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test	2013-12-27 20:18:58 +08:00
spine	Some warning fixes.	2013-12-25 16:06:39 +08:00