axmol/cocos
Ricardo Quesada 97fb43b8d7 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
..
2d Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 2013-12-06 11:19:12 -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 fix some warnings 2013-12-06 16:32:06 +08:00
editor-support fix some warnings 2013-12-06 16:32:06 +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 fix some warnings 2013-12-06 16:32:06 +08:00
scripting [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-06 09:31:16 +00:00
storage/local-storage perfect vs-project configuration 2013-10-31 10:51:38 +08:00