2youyou2 4d1bf0c1a2 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 ... Conflicts: tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp		2014-06-12 09:42:20 +08:00
..
cpp-empty-test	Support Fast App Resume.	2014-06-04 11:19:53 +08:00
cpp-tests	Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3	2014-06-12 09:42:20 +08:00
lua-empty-test	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
lua-tests	Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget	2014-06-10 11:30:39 +08:00