axmol/plugin/samples/HelloPlugins
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 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +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.ios issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00