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
..
watermelonwithme	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	issue #1603:adjust samples directory	2012-12-20 14:14:53 +08:00
Application.mk	issue #2305: use 4.7 toolchain to fix compiling errors	2013-06-21 17:17:23 +08:00