James Chen 75b5edb66c Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test		2013-12-19 11:16:03 +08:00
..
2d	Merge branch 'develop' into node_fixes	2013-12-18 18:33:56 -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	Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better.	2013-12-18 17:01:57 +08:00
editor-support	Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test	2013-12-19 11:16:03 +08:00
gui	fix some warnings	2013-12-06 16:32:06 +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	Merge pull request #4486 from boyu0/iss2771_physical	2013-12-15 18:30:48 -08:00
scripting	Merge branch 'develop' into Array	2013-12-19 09:42:21 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00