Dhilan007 7ebe4a5548 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 ... Conflicts: cocos/audio/AudioEngine.cpp cocos/audio/apple/AudioPlayer.h cocos/audio/include/AudioEngine.h tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h		2014-09-30 09:45:47 +08:00
..
android	move AudioEngine in cocos2d:experimental namespace	2014-09-16 10:22:25 +08:00
apple	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00
include	Fixes audio issues when using CMake on Mac	2014-09-29 14:07:11 -03:00
ios	Fixes audio issues when using CMake on Mac	2014-09-29 14:07:11 -03:00
linux	Squashed commit of the following:	2014-04-30 19:09:13 -07:00
mac	Squashed commit of the following:	2014-09-09 12:18:31 -07:00
openal	Update SimpleAudioEngineOpenAL.cpp	2014-04-10 01:00:23 +03:00
proj.wp8	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
win32	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00
winrt	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
wp8	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
AudioEngine.cpp	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00