Huabing.Xu 421310f3a8 Merge branch 'v3' into v3_fixCrashNoVAO ... Conflicts: cocos/renderer/ccGLStateCache.cpp		2015-01-23 14:50:21 +08:00
..
2d	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
3d	Merge pull request #10182 from super626/v3	2015-01-23 12:02:00 +08:00
audio	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
base	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
deprecated	comments	2015-01-06 14:45:10 +03:00
editor-support	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01: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	Fixed lots of compiler warnings	2015-01-23 02:02:33 +01:00
renderer	Merge branch 'v3' into v3_fixCrashNoVAO	2015-01-23 14:50:21 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2015-01-22 06:08:11 +00:00
storage	fix typo of file name	2014-10-17 16:29:37 +08:00
ui	fix slider scale9 render	2015-01-22 15:53:33 +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