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
..
AudioEngine.h	Add javascript notes...	2015-03-19 18:41:11 +08:00
Export.h	added support for static and shared builds with audio and studio	2014-10-03 23:20:52 +01:00
SimpleAudioEngine.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate	2015-03-19 20:28:29 +08:00