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
..
bindings	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding	2013-12-30 21:06:57 +08:00
script	Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test	2013-12-27 20:18:58 +08:00