minggo 04fd2b16b2 merge v3.13 back to v3		2016-08-29 11:57:13 +08:00
..
GUI	Fix typos in variable names	2016-07-26 04:06:01 +09:00
Particle3D	Add missing float suffix to avoid -Wdouble-promotion	2016-07-04 23:12:45 +09:00
assets-manager	Fix typos and other mistakes in docs	2016-07-04 00:42:10 +09:00
physics-nodes	Merge part of Cocos2d-x-lite (#16380)	2016-08-19 16:28:47 +08:00
Android.mk	remove curl link for Android	2016-07-21 11:56:56 +08:00
CMakeLists.txt	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
ExtensionDeprecated.cpp	Update copyright to 2016. (#16311)	2016-08-05 09:42:15 +08:00
ExtensionDeprecated.h	Update copyright to 2016. (#16311)	2016-08-05 09:42:15 +08:00
ExtensionExport.h	Combine Studio change for particle 3d	2015-11-18 14:34:14 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	update for 3D object render, revert old changes	2015-12-18 11:23:33 +08:00