yangxiao 9b117bf87c resolve conflict		2015-02-13 15:46:19 +08:00
..
2d	resolve conflict	2015-02-13 15:46:19 +08:00
3d	resolve conflict	2015-02-13 15:46:19 +08:00
audio	Fixed audio can't resume after the interruption of audio session has ended on iOS.	2015-02-12 15:38:44 +08:00
base	Merge pull request #10241 from Dhilan007/v3-scheduled-fix	2015-01-28 15:22:40 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Tabs to spaces	2015-01-29 10:40:00 +01:00
math	modify by colleague for cocostudio.	2015-01-16 13:23:03 +08:00
network	Set default value for `Content-Type` of headfield in `PUT` method	2015-01-31 22:15:15 +08:00
physics	Fixed Scale9Sprite can't run move/scale/rotation action in physics scene	2015-01-27 16:13:45 +08:00
platform	Merge pull request #10442 from Dhilan007/v3-accelerometer-fix	2015-02-12 17:20:07 +08:00
renderer	resolve conflict	2015-02-13 15:46:19 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-02-12 10:47:08 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #10218 from andyque/fixIssue10183	2015-01-28 09:57:34 +08:00
Android.mk	only mathUtil.cpp compiles with neon	2015-01-21 18:29:28 +08:00
CMakeLists.txt	cmake: fix using of external/xxhash for msvc generated project	2015-01-26 10:03:49 +03:00
cocos2d.cpp	[ci skip] update version	2015-01-19 09:50:19 +08:00
cocos2d.h	[ci skip]update version	2015-01-13 16:35:45 +08:00