CaiWenzhi 759fcc147b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop		2013-09-16 20:55:55 +08:00
..
Cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop	2013-09-16 20:55:55 +08:00
Javascript	upstream synchronize	2013-09-16 19:46:14 +08:00
Lua	Merge pull request #3596 from dumganhar/new-event-dispatcher-rename	2013-09-15 20:13:51 -07:00
samples.xcodeproj	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00