XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim ... Conflicts: cocos/scripting/js-bindings/manual/js_manual_conversions.h		2015-12-01 15:12:32 +08:00
..
.settings	[A] add generate libs and binary template	2015-05-22 19:47:16 +08:00
frameworks/runtime-src	Merge pull request #14209 from pandamicro/v3	2015-10-22 12:55:25 +08:00
res	Support new portrait project from js templates.	2015-07-20 09:58:40 +08:00
src	Support new portrait project from js templates.	2015-07-20 09:58:40 +08:00
.project	[A] add generate libs and binary template	2015-05-22 19:47:16 +08:00
cocos-project-template.json	Update console sub-module, update project template.json to meet file position change	2015-12-01 15:00:45 +08:00
config.json	[A] add generate libs and binary template	2015-05-22 19:47:16 +08:00
index.html	Set the transparency will affect the labelTTF	2015-08-18 18:30:03 +08:00
main.js	Improve js template documentation	2015-11-24 16:31:14 +08:00
manifest.webapp	[A] add generate libs and binary template	2015-05-22 19:47:16 +08:00
project.json	Improve js templates with noCache and cc.view.setRealPixelResolution docs	2015-11-01 18:33:05 +08:00