yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXUIImage_win32.cpp cocos2dx/platform/win32/CCXUIImage_win32.h tests/test.win32/test.win32.vcproj		2011-01-28 14:33:47 +08:00
..
Res	issue #307: add music resource	2011-01-21 15:17:23 +08:00
test.android	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-27 09:56:45 +08:00
test.iphone	[iphone]: font support	2011-01-21 18:15:12 +08:00
test.uphone	[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.	2011-01-25 14:26:26 +08:00
test.win32	fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.	2011-01-24 15:53:52 +08:00
tests	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-28 14:33:47 +08:00
AppDelegate.cpp	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00
AppDelegate.h	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00