chengstory 8ae7ecff33 Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h		2013-12-26 12:55:52 +08:00
..
2d	Some warning fixes.	2013-12-25 16:06:39 +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 #4631 from boyu0/const_char_star_to_std_string	2013-12-24 22:34:34 -08:00
editor-support	Merge branch 'develop' into #3457	2013-12-26 12:55:52 +08:00
gui	Fixed bugs about color and opacity	2013-12-25 18:30:21 +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	issue #2771: fix warning log and fix typo.	2013-12-23 14:30:43 +08:00
scripting	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-12-26 02:50:37 +00:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00