James Chen 0d16f7bc3b Merge pull request #4712 from dumganhar/cocostudio-test ... Merge PR #4672: We need to replace trigger system by EventDispatcher in future.		2013-12-27 05:05:41 -08:00
..
bindings	Improve the coding style	2013-12-27 20:07:00 +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