samuele3hu 70dec15e76 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix		2014-04-10 23:38:57 +08:00
..
2d	[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui	2014-04-10 21:14:24 +08:00
audio	Merge pull request #6200 from dumganhar/iss4729-deprecated-folder	2014-04-10 11:17:21 +08:00
base	fix CCConsole linux crash	2014-04-10 18:31:28 +08:00
deprecated	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
editor-support	Merge pull request #6123 from ololomax/patch-1	2014-04-10 17:05:45 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08: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	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix	2014-04-10 23:38:57 +08:00
storage	added wp8 support files and projects	2014-03-28 15:39:20 -07:00
ui	Removed unused comments in GUIDefine.h	2014-04-10 17:15:59 +08:00