James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-04-25 10:59:11 +08:00
..
2d	Merge pull request #6325 from MSOpenTech/wp8-3.0-update	2014-04-25 10:41:58 +08:00
audio	translate	2014-04-21 11:07:14 +08:00
base	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012	2014-04-25 10:59:11 +08:00
deprecated	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
editor-support	Fixed bug of gui reader	2014-04-23 15:02:35 +08:00
math/kazmath	Culling working again	2014-04-14 16:46:19 -07:00
network	= [FIX]: HTTPClient should not report 2xx status codes as errors!	2014-04-09 11:07:51 +04:00
physics	issue #4729: some warning fixes and compilation error fixes on win32.	2014-04-10 01:29:13 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-04-21 06:45:09 +00:00
storage	added wp8 support files and projects	2014-03-28 15:39:20 -07:00
ui	Remove useless codes	2014-04-17 14:27:21 +08:00