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 #2404:Add more deprecated function and Modify template vs11 solution	2013-07-28 00:16:16 +08:00
Resources	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +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	Update RootViewController.mm	2013-09-13 09:42:26 +08:00
proj.linux	issue #2460: project template for glfw	2013-09-02 13:48:39 +08:00
proj.mac	issue #2460: project template for glfw	2013-09-02 13:48:39 +08:00
proj.win32	Win32 icons on template	2013-09-09 00:42:36 -03:00