samuele3hu cf5e04ad63 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest ... Conflicts: samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp		2013-09-16 16:58:30 +08:00
..
Classes	issue #2732: [iOS] Updating the reference of auto-generated binding glue codes.	2013-08-27 16:05:48 +08:00
Resources	fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is".	2013-02-18 16:25:21 +08:00
proj.android	Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for the android projects	2013-09-16 16:55:16 +08:00
proj.ios	issue #2800:Can not hide status bar on iOS 7	2013-09-13 16:18:58 +08:00
proj.win32	Win32 icons on template	2013-09-09 00:42:36 -03:00