VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs ... Conflicts: cocos/base/CCAutoreleasePool.h cocos/base/CCData.h		2015-03-18 21:38:56 +08:00
..
2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs	2015-03-18 21:38:56 +08:00
3d	Merge pull request #10899 from super626/v3	2015-03-17 19:29:21 +08:00
audio	Fixed compilation issue. Introduced missing CLASS_NAME	2015-03-04 10:48:30 +01:00
base	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs	2015-03-18 21:38:56 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Avoid crash during parse .csd file.	2015-03-18 10:28:12 +08:00
math	modify by colleague for cocostudio.	2015-01-16 13:23:03 +08:00
network	Now, mac uses ObjC HTTP client	2015-03-10 14:48:57 +04:00
physics	Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]	2015-03-12 23:47:58 +01:00
platform	Added Bulgarian language.	2015-03-17 15:14:02 +02:00
renderer	[ci skip] update comments CCQuadCommand.h	2015-03-18 20:12:34 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-03-18 05:55:07 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #10873 from konopka/fix_compiler_override_warnings	2015-03-17 10:38:19 +08:00
Android.mk	only mathUtil.cpp compiles with neon	2015-01-21 18:29:28 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip]update version	2015-03-18 13:52:52 +08:00
cocos2d.h	[ci skip] update version	2015-02-26 10:40:30 +08:00
doxygen_modules.h	Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules.	2015-03-17 11:26:33 +08:00