axmol/samples/Cpp/HelloCpp/proj.android/jni/hellocpp
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
..
main.cpp Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 2013-07-16 16:33:02 +08:00