Ricardo Quesada 462f4f4c0a Merge pull request #15156 from ricardoquesada/cmake_android_squash_2 ... cmake for android		2016-03-02 17:24:35 -08:00
..
cpp-template-default	Squashed commit of the following:	2016-03-02 16:51:54 -08:00
js-template-default	Merge pull request #14810 from GuoLunHao/v3.10_templates	2015-12-30 11:39:00 +08:00
js-template-runtime	fix compile error in visual studio 2015	2015-12-29 15:02:22 +08:00
lua-template-default	Squashed commit of the following:	2016-03-02 16:51:54 -08:00
lua-template-runtime	Update console sub-module, update project template.json to meet file position change	2015-12-01 15:00:45 +08:00
cocos2dx_files.json	[AUTO][ci skip]: updating cocos2dx_files.json	2016-03-01 01:37:51 +00:00