minggo 046668c3f1 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master		2011-01-26 10:02:26 +08:00
..
Res	issue #307: add music resource	2011-01-21 15:17:23 +08:00
test.android	[android]fix a bug of SimpleAudioEngine::playEffect()	2011-01-26 09:46:34 +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	[iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog	2011-01-25 16:56:46 +08:00
AppDelegate.cpp	[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.	2011-01-19 18:02:35 +08:00
AppDelegate.h	issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them	2010-11-12 09:24:12 +00:00