samuele3hu 6d678ce443 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion		2014-07-23 11:57:56 +08:00
..
2d	Merge pull request #7556 from Dhilan007/v3	2014-07-23 11:29:26 +08:00
3d	Merge pull request #7526 from chenguangqi/v3	2014-07-21 13:54:31 +08:00
audio	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
base	missing include	2014-07-22 15:49:39 +04:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	Merge pull request #7546 from nutty898/v3_nutty_modifynodereader	2014-07-22 18:34:36 +08:00
math	add CC_DLL for functions	2014-07-15 11:18:05 +08:00
network	Reset Webscoket	2014-07-21 16:05:10 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	Copyright & small fixes	2014-07-22 15:49:38 +04:00
renderer	Copyright & small fixes	2014-07-22 15:49:38 +04:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion	2014-07-23 11:57:56 +08:00
storage	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
ui	1. add export to function CocosGUIVersion()	2014-07-22 10:02:00 +08:00
Android.mk	software per decompression support	2014-07-22 15:49:36 +04:00
CMakeLists.txt	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	[ci skip]	2014-07-15 15:11:17 +08:00
cocos2d.h	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix	2014-07-11 16:44:59 +08:00