James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes ... Conflicts: cocos2dx/textures/CCTextureCache.cpp		2013-07-16 16:33:02 +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	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes	2013-07-16 16:33:02 +08:00
proj.blackberry	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +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.marmalade	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