WenhaiLin 1839564fbb Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7		2015-05-04 10:16:47 +08:00
..
2d	merge v3.6	2015-04-30 13:46:08 +08:00
3d	missing texture color	2015-04-29 10:30:18 +08:00
audio	Add FileUtils::getSuitableFOpen	2015-04-19 14:00:27 +03:00
base	Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7	2015-05-04 10:16:47 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Fix a logical bug that may cause null pointer been used	2015-04-29 15:58:44 +08:00
math	Optimize Vec2	2015-04-19 20:40:52 +03:00
network	Fix android http client memory leak	2015-04-26 20:52:09 +09:00
physics	Merge pull request #10679 from loadrunner/physics_sensor	2015-04-27 17:40:08 +08:00
platform	Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7	2015-05-04 10:16:47 +08:00
renderer	merge v3.6	2015-04-30 13:46:08 +08:00
scripting	[AUTO]: updating luabinding automatically	2015-04-30 06:56:36 +00:00
storage	Fix local storage get item issue when item inexist	2015-04-23 19:06:06 +08:00
ui	remove uishader settings	2015-04-20 17:04:49 +08:00
Android.mk	Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest	2015-04-28 09:17:00 +08:00
CMakeLists.txt	fix typo	2015-03-05 17:05:08 +08:00
cocos2d.cpp	[ci skip] update version	2015-04-27 16:46:03 +08:00
cocos2d.h	[ci skip] update version	2015-04-07 10:35:49 +08:00