James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor ... Conflicts: cocos/2d/CCUserDefault.cpp cocos/2d/CCUserDefault.mm cocos/2d/CCUserDefaultAndroid.cpp cocos/2d/ZipUtils.cpp cocos/2d/platform/CCFileUtils.h cocos/2d/platform/CCSAXParser.cpp		2013-12-20 21:12:11 +08:00
..
2d	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor	2013-12-20 21:12: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 branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor	2013-12-20 21:12:11 +08:00
editor-support	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor	2013-12-20 21:12:11 +08:00
gui	fixes compiler warnings	2013-12-19 12:23:42 -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	closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.	2013-12-20 19:47:11 +08:00
scripting	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-12-20 09:35:05 +00:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00