bmanGH b55aec2fa0 Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: cocos/scripting/auto-generated tools/bindings-generator		2013-12-09 14:59:17 +08:00
..
2d	issue #2790: Fix for TMXObjectGroup::getObject.	2013-12-07 16:38:50 +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	issue #2790: CCLOG —> CCLOGINFO in CCMap.h	2013-12-07 23:32:29 +08:00
editor-support	issue #2790: Error fix in CCBReader.	2013-12-09 09:54:04 +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	fix some warnings	2013-12-06 16:32:06 +08:00
physics	issue #2790: Small fixes for physics, uses reference and std::move.	2013-12-09 10:54:22 +08:00
scripting	Merge remote-tracking branch 'upstream/develop' into develop	2013-12-09 14:59:17 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00