samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test		2015-03-30 15:51:01 +08:00
..
2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test	2015-03-30 15:51:01 +08:00
3d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test	2015-03-30 15:51:01 +08:00
audio	Update comment for Lua	2015-03-30 15:47:47 +08:00
base	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test	2015-03-30 15:51:01 +08:00
deprecated	[ci skip]Update comments	2015-03-24 20:23:51 +08:00
editor-support	Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash	2015-03-25 13:36:28 +08:00
math	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
network	[ci skip]Update comments.	2015-03-27 18:26:14 +08:00
physics	Update comment for Lua	2015-03-30 15:47:47 +08:00
platform	fix doxygen comment	2015-03-27 17:09:54 +08:00
renderer	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test	2015-03-30 15:51:01 +08:00
scripting/lua-bindings	Update Sprite3DCubeMap test case	2015-03-28 14:59:47 +08:00
storage	[ci skip]Update comments	2015-03-24 14:12:58 +08:00
ui	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test	2015-03-30 15:51:01 +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	merge cocos	2015-03-26 12:50:18 +08:00