James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt		2013-12-17 15:50:24 +08:00
..
2d	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +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 branch 'develop' into newRenderer	2013-12-14 19:28:01 -08:00
editor-support	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +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	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
physics	Merge pull request #4486 from boyu0/iss2771_physical	2013-12-15 18:30:48 -08:00
scripting	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-12-17 07:25:00 +00:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00