James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test ... Conflicts: cocos/scripting/auto-generated		2013-12-27 20:18:58 +08:00
..
2d	Merge pull request #4688 from walzer/develop	2013-12-27 04:04:48 -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	Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test	2013-12-27 20:18:58 +08:00
gui	Modify wrong codes	2013-12-27 18:23:53 +08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
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	Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test	2013-12-27 20:18:58 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00