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
..
hellocpp	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes	2013-07-16 16:33:02 +08:00
Android.mk	closed #2376, Add online IAP feature in plugins : uc, nd91 & qh360.	2013-07-05 10:51:08 +08:00
Application.mk	issue #2336, Add a sample project with all plugins.	2013-06-28 11:46:39 +08:00