lvlong 6304a89462 Merge branch 'v3' of github.com:super626/cocos2d-x into v3		2015-02-11 14:27:25 +08:00
..
2d	Merge pull request #229 from lvlonggame/v3	2015-02-04 09:38:31 +08:00
3d	Merge branch 'v3' of github.com:super626/cocos2d-x into v3	2015-02-11 14:27:25 +08:00
audio	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
base	Merge pull request #10173 from tmr111116/fix_random_int_overflow	2015-01-23 16:38:08 +08:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Merge pull request #10231 from geron-cn/fixanimationlistclone	2015-01-27 15:24:25 +08:00
math	modify by colleague for cocostudio.	2015-01-16 13:23:03 +08:00
network	Fixed inconsistent time-scale in Httpclient.	2015-01-19 10:50:42 +09:00
physics	Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.	2015-01-21 12:59:53 +03:00
platform	Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix	2015-01-26 13:51:08 +08:00
renderer	Merge branch 'newcode' into v3	2015-01-27 16:35:54 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-01-27 05:58:53 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	Merge pull request #10209 from andyque/fixLoadingBarReloadTexture	2015-01-27 13:50:38 +08:00
Android.mk	only mathUtil.cpp compiles with neon	2015-01-21 18:29:28 +08:00
CMakeLists.txt	update external config to v3-deps-28.zip and update cocos2d-x version to rc2	2014-12-04 14:23:44 +08: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