minggo f6cfe3007f issue #2412:fix merging conflict		2013-07-23 10:41:11 +08:00
..
android	issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().	2013-07-19 13:40:45 +08:00
emscripten	issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().	2013-07-19 13:40:45 +08:00
include	Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers	2013-07-22 10:06:14 +08:00
ios	More best practices fixes	2013-07-18 16:30:19 -07:00
linux	issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().	2013-07-19 13:40:45 +08:00
mac	More best practices fixes	2013-07-18 16:30:19 -07:00
openal	Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.	2013-07-22 11:36:20 +08:00
proj.emscripten	Remove LOG prefixes from emscripten makefiles	2013-05-06 21:00:38 -07:00
proj.ios/CocosDenshion.xcodeproj	issue #2325: Updating project configuration, tested on iPad 3.	2013-06-24 18:32:06 +08:00
proj.linux	Added -std=c++0x flag in C++ eclipse projects	2013-07-09 15:23:19 +02:00
proj.mac/CocosDenshion.xcodeproj	cocos2d-x in Mac:	2013-06-28 19:02:10 -07:00
proj.nacl	CocosDenshion: added effects customization for 7 platforms.	2013-06-29 13:44:16 +04:00
proj.tizen	[Tizen] Fix compile error.	2013-07-19 15:16:05 +09:00
proj.win32	closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation.	2013-06-23 17:25:34 +08:00
third_party/fmod	issue #2412:remove blackberry and marmalade port because they don't support c++11	2013-07-19 13:55:03 +08:00
win32	issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().	2013-07-19 13:40:45 +08:00