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
..
2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00
3d	Merge pull request #8106 from super626/v3	2014-09-19 16:16:33 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32	2014-09-30 09:45:47 +08:00
base	Merge pull request #8164 from super626/v3	2014-09-26 23:29:58 +08:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	Fix pull request #6894 merge conflicts	2014-09-29 16:22:55 +08:00
math	neon works on android(only on armeabi-v7a)	2014-09-25 16:09:28 +08:00
network	Rename setSSLVerification	2014-09-14 00:28:11 +09:00
physics	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
platform	change tab to space	2014-09-29 18:44:01 +08:00
renderer	add comment	2014-09-18 12:04:42 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-09-29 10:11:17 +00:00
storage/local-storage	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
ui	remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp	2014-09-24 17:47:38 +08:00
Android.mk	neon works on android(only on armeabi-v7a)	2014-09-25 16:09:28 +08:00
CMakeLists.txt	Fixes audio issues when using CMake on Mac	2014-09-29 14:07:11 -03:00
cocos2d.cpp	[ci skip]update version info	2014-09-19 21:54:01 +08:00
cocos2d.h	merge cocos	2014-09-10 10:28:59 +08:00