samuele3hu 550f4dca29 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label		2014-04-03 17:03:09 +08:00
..
2d	Merge pull request #6110 from dumganhar/iss4639-isfileexist	2014-04-02 18:12:29 +08:00
audio	fix resume not support in midi file in win32	2014-04-03 09:55:31 +08:00
base	add [director end] command's explain in CCConsole.cpp.	2014-03-28 13:50:06 +08:00
editor-support	remove cc prefix	2014-04-03 16:19:49 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08:00
network	added wp8 support files and projects	2014-03-28 15:32:52 -07:00
physics	fix PhysicsShapeEdgeChain::init() always return false	2014-04-02 23:52:21 +08:00
scripting/lua-bindings	fix the error about `draw` of GLNode and modify the related test cases	2014-04-03 17:02:14 +08:00
storage	added wp8 support files and projects	2014-03-28 15:39:20 -07:00
ui	Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301	2014-03-31 15:37:45 +08:00