axmol/cocos/audio
Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-09-10 14:35:33 +08:00
..
android 1.Fix name of variables. 2014-09-10 13:47:17 +08:00
include Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08:00
ios Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08: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 Compiles in Win32 2014-09-09 18:07:24 -07: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 Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08:00