pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/audio/winrt/Audio.cpp cocos/platform/winrt/CCCommon.cpp cocos/platform/winrt/CCWinRTUtils.cpp cocos/platform/winrt/CCWinRTUtils.h		2015-08-27 10:40:04 +08:00
..
android	CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.	2015-08-10 22:41:18 +08:00
apple	AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac]	2015-08-11 18:11:59 +08:00
include	1.AudioEngine:support callback for preload feature.	2015-07-28 15:27:07 +08:00
ios	Fixes audio issues when using CMake on Mac	2014-09-29 14:07:11 -03:00
linux	add guard to audio engine pointer	2015-06-25 10:17:31 +08:00
mac	Squashed commit of the following:	2014-09-09 12:18:31 -07:00
openal	Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>"	2014-11-18 17:27:43 +03:00
win32	fixed whitespace	2015-08-13 19:24:41 -04:00
winrt	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3	2015-08-27 10:40:04 +08:00
AudioEngine.cpp	1.AudioEngine:support callback for preload feature.	2015-07-28 15:27:07 +08:00
CMakeLists.txt	remove unnneded includes and declarations	2014-11-18 10:06:45 +03:00