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
..
Classes	Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3	2014-06-12 09:42:20 +08:00
Resources	support relative path for reading json	2014-06-11 21:11:22 +08:00
proj.android	tests release/debug build	2014-05-21 21:13:44 +04:00
proj.ios	Fixes compiler warnings for mac and ios	2014-05-22 16:34:16 -03:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.win32	add TimelineAction	2014-06-11 11:10:07 +08:00
proj.wp8-xaml	Support Fast App Resume.	2014-06-04 11:19:53 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	closed #4819: remove KeyboardTest	2014-05-28 18:31:00 +08:00
CMakeLists.txt	Merge pull request #6916 from John-He-928/mingw-build	2014-05-29 15:17:07 +08:00