James Chen 71d21d2e10 Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename		2013-12-31 19:13:59 +08:00
..
2d	Merge branch 'develop' into develop_RenderTextureBug	2013-12-31 14:58:11 +08:00
audio	added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors	2013-12-05 03:37:27 +00:00
base	Merge pull request #4696 from dumganhar/warning-fix	2013-12-27 01:56:47 -08:00
editor-support	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
gui	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
math/kazmath	…
network	Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.	2013-12-18 15:40:31 +08:00
physics	fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment	2013-12-26 23:55:05 +08:00
scripting	Bug fix in cc.VisibleRect	2013-12-31 18:17:20 +08:00
storage/local-storage	…