4 Commits

Author	SHA1	Message	Date
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
youyou	28ae57c5fc	add AsyncReader	2014-06-12 00:38:23 +08:00
2youyou2	aa06fab776	support relative path for reading json	2014-06-11 21:11:22 +08:00
2youyou2	09a2ceb7df	add TimelineAction	2014-06-11 11:10:07 +08:00