Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h		2014-04-14 14:08:19 +08:00
..
android	android can work now	2014-04-11 12:02:56 +08:00
include	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
ios	closed #4590, remove -> property access	2014-03-28 16:41:33 +08:00
linux	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
mac	closed #4590, remove -> property access	2014-03-28 16:41:33 +08:00
openal	Update SimpleAudioEngineOpenAL.cpp	2014-04-10 01:00:23 +03:00
proj.win32	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
proj.wp8	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
win32	fix resume not support in midi file in win32	2014-04-03 09:55:31 +08:00
winrt	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
wp8	closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak	2014-04-11 17:53:00 +08:00
CMakeLists.txt	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00