minggo 0b699e8f19 fix conflict		2017-10-09 10:23:13 +08:00
..
Classes	Removed extra parens (#18075)	2017-07-17 15:53:57 +08:00
Resources	Support new portrait project from cpp template.	2015-07-20 09:58:40 +08:00
proj.android	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00
proj.android-studio	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00
proj.ios_mac	Supports full screen for iPhone X and uses Storyboard for launch screen. (#18276)	2017-09-19 15:01:19 +08:00
proj.linux	fix for wrong directory in linux cpp-template	2014-09-27 10:38:10 +01:00
proj.win32	remove bullet project (#17961)	2017-06-21 17:15:09 +08:00
CMakeLists.txt	fix output bin path (#18258)	2017-09-13 16:38:50 +08:00
cocos-project-template.json	[ci skip]Remove win10 and tizen support	2017-09-22 17:54:37 +08:00