dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate ... Conflicts: cocos/audio/include/SimpleAudioEngine.h		2015-03-19 20:28:29 +08:00
..
android	Fixed compilation issue. Introduced missing CLASS_NAME	2015-03-04 10:48:30 +01:00
apple	Fixed audio can't resume after the interruption of audio session has ended on iOS.	2015-02-12 15:38:44 +08:00
include	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate	2015-03-19 20:28:29 +08: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	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	Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID	2014-12-31 20:51:45 -04:00
winrt	updated for Windows 8.1	2014-10-14 14:13:14 -07:00
wp8	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
AudioEngine.cpp	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
CMakeLists.txt	remove unnneded includes and declarations	2014-11-18 10:06:45 +03:00