minggo f6cfe3007f issue #2412:fix merging conflict		2013-07-23 10:41:11 +08:00
..
Classes	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
Resources	issue #1733: Marmalade ok.	2013-02-19 18:26:00 +08:00
proj.android	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background.	2013-07-17 12:53:30 +08:00
proj.emscripten	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.ios	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.linux	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.mac	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.nacl	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.tizen	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
proj.win32	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00