chuanweizhang 6e871e8803 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: template/multi-platform-js/Classes/AppDelegate.cpp		2013-12-25 18:12:16 +08:00
..
Classes	modify create_project	2013-12-25 15:53:47 +08:00
Resources	rename jsb boot file.	2013-11-07 23:51:01 +08:00
proj.android	modify template	2013-12-25 11:01:23 +08:00
proj.ios_mac	modify template	2013-12-24 09:42:37 +08:00
proj.win32	modify template	2013-12-24 09:42:37 +08:00