6 Commits

Author	SHA1	Message	Date
yinkaile	3cfba7bc9a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: extensions/Android.mk extensions/proj.win32/libExtensions.vcxproj.filters samples/Cpp/TestCpp/Android.mk samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp	2013-06-06 12:35:18 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00
Lee, Jae-Hong	6289a20fcb	Adding design size for Tizen.	2013-05-16 20:23:21 +09:00
James Chen	2694cb150b	CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.	2013-01-29 09:56:38 +08:00
James Chen	e736ed487f	issue #1683: Adding default search path if developer didn't pass it.	2013-01-28 17:44:53 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00