dingpinglv de73f25e42 Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h		2015-03-19 21:44:44 +08:00
..
2d	Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h	2015-03-19 21:44:44 +08:00
3d	Merge pull request #10899 from super626/v3	2015-03-17 19:29:21 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate	2015-03-19 20:28:29 +08:00
base	Issue: Added js annotates to CCScheduler.h	2015-03-19 21:25:09 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator.	2015-03-19 17:54:26 +08:00
math	modify by colleague for cocostudio.	2015-01-16 13:23:03 +08:00
network	Merge pull request #10340 from seobyeongky/network_bugfix2	2015-03-19 21:12:51 +08:00
physics	add document for physics	2015-03-19 17:58:08 +08:00
platform	Merge pull request #10340 from seobyeongky/network_bugfix2	2015-03-19 21:12:51 +08:00
renderer	Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h	2015-03-19 20:20:16 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-03-19 12:30:15 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	[ci skip]Update document	2015-03-19 10:38:12 +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