dumganhar d108f4f456 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base		2011-11-28 23:13:02 +08:00
..
sdk1.0	fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.	2011-11-28 18:05:38 +08:00
sdk2.0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base	2011-11-28 23:13:02 +08:00