minggo b275a3e2f0 fix conflict		2017-09-20 09:11:35 +08:00
..
Classes	Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555)	2017-03-22 11:19:25 +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	fix conflict	2017-09-20 09:11:35 +08:00
proj.linux	Add js template.	2015-04-15 17:49:33 +08:00
proj.win32	remove bullet project (#17961)	2017-06-21 17:15:09 +08:00