Nite Luo be71eb8626 Merge branch 'develop' into newRenderer ... Conflicts: .gitignore build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_samples.xcodeproj/project.pbxproj cocos/2d/CCDirector.cpp		2013-11-07 17:24:57 -08:00
..
2d	Merge branch 'develop' into newRenderer	2013-11-07 17:24:57 -08:00
audio	issue #3113: 32Bit fix and 13.10 32bit complication is ok.	2013-11-06 14:54:35 +08:00
base	Adds more 64-bit fixes	2013-11-05 17:36:44 -08:00
editor-support	Test commit	2013-11-06 18:30:09 +08:00
gui	Merge pull request #4125 from minggo/fix-compiling-error	2013-11-07 02:04:27 -08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	issue #3113: 32Bit fix and 13.10 32bit complication is ok.	2013-11-06 14:54:35 +08:00
physics	Fixes some compiler warnings	2013-11-04 16:31:36 -08:00
scripting	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-11-07 09:11:22 +00:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00