yangxiao 1581396810 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3		2014-06-20 18:54:34 +08:00
..
2d	Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3	2014-06-20 16:14:46 +08:00
3d	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-06-20 18:54:34 +08:00
audio	Add new line at the end of a file to *.mm	2014-06-19 20:48:50 +09:00
base	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
deprecated	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
editor-support	Merge pull request #6946 from hanjukim/skip-utf8-bom	2014-06-19 22:02:38 +08:00
math	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
network	fix mingw32/64 build:	2014-05-30 19:54:59 +08:00
physics	closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.	2014-05-21 16:07:49 +08:00
platform	CCLOGINFO compilation fix	2014-06-19 20:59:08 +04:00
renderer	Merge pull request #7139 from zawasp/uniform_struct	2014-06-19 20:55:37 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-06-19 13:24:36 +00:00
storage	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
ui	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
Android.mk	change speed	2014-06-17 13:45:58 +08: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-06-17 18:42:10 +08:00
cocos2d.h	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00