axmol/CocosDenshion
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
..
Linux issue #781: add sound functions on linux 2011-11-24 22:16:24 -08:00
android issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
bada fixed #781: Add functions for effects 2011-11-29 09:27:44 +08:00
include issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
iphone issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
marmalade Added marmalade support, removed airplay 2011-12-11 10:19:41 +01:00
proj.bada remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
proj.linux add 64 bit fmodex for Linux 2011-10-28 15:43:44 +08:00
proj.marmalade Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
proj.qnx modify all projects config 2011-12-09 17:03:11 +08: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
qnx fix a crash bug in SimpleAudioEngine.cpp 2011-12-09 15:54:35 +08:00
third_party/fmod install correct fmod libs to /usr/local/lib 2011-11-09 18:47:14 +08:00
win32 issue #781: implement audio functions on win32 2011-11-25 14:27:30 +08:00
wophone issue #633 add playeffect loop in wophone 2011-07-26 17:04:39 +08:00