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
..
android	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
multi-platform-cpp	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes	2013-07-16 16:33:02 +08:00
multi-platform-js	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
multi-platform-lua	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
xcode4	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00