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
..
cpp-empty-test	Merge branch 'v3' into addChipmunkStaticLib	2014-09-10 10:00:15 +08:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00
game-controller-test	remove unneeded files	2014-09-03 11:52:19 +08:00
lua-empty-test	Platform fixed	2014-09-09 16:50:02 -07:00
lua-game-controller-test	Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.	2014-08-28 16:13:11 +08:00
lua-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D	2014-09-29 09:48:35 +08:00