minggo 9c40277e48 Merge pull request #14980 from catinred2/dev ... fix typo		2016-04-18 17:21:40 +08:00
..
cpp-template-default	Remove include of cocos2d.h (#15435)	2016-04-18 15:09:21 +08:00
js-template-default	Remove include of cocos2d.h (#15435)	2016-04-18 15:09:21 +08:00
js-template-runtime	Merge pull request #15388 from pandamicro/v3	2016-04-07 23:15:39 +08:00
lua-template-default	Merge pull request #14980 from catinred2/dev	2016-04-18 17:21:40 +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-04-18 07:48:59 +00:00