dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada ... Conflicts: cocos2dx/platform/CCAccelerometer_platform.h cocos2dx/platform/CCApplication_platform.h cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/CCEGLView_platform.h cocos2dx/platform/CCPlatformConfig.h cocos2dx/platform/CCSAXParser.h cocos2dx/platform/CCStdC.h tests/AppDelegate.cpp tests/tests/Box2DTestBed/Tests/EdgeShapes.h		2011-09-29 16:03:37 +08:00
..
Linux	modified: CocosDenshion/Linux/FmodAudioPlayer.cpp	2011-08-25 19:04:29 +08:00
airplay	fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade	2011-08-31 16:35:40 +08:00
android	fixed #727: invoke DeleteLocalRef() to resolve memory leak	2011-09-20 14:25:16 +08:00
bada	add some log in CocosDenshion	2011-09-28 22:53:51 +08:00
include	modify <cstdio> to <stdio.h>	2011-09-20 12:39:44 +08:00
iphone	fixed #716: don't convert effect volume to int	2011-09-13 14:10:32 +08:00
proj.airplay	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
proj.bada	modify gameloop method	2011-09-29 02:32:01 +08:00
proj.linux	make HelloWorld and tests runs ok on linux	2011-09-27 22:56:06 -07:00
proj.win32	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
proj.wophone	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
third_party/fmod	fixed #723: remove unneeded files	2011-09-28 14:30:33 +08:00
win32	fixed #633 add playeffect looply,in win32	2011-07-28 09:58:10 +08:00
wophone	issue #633 add playeffect loop in wophone	2011-07-26 17:04:39 +08:00