axmol

History

yangws e895d9d073 TextInputTest compile ok on android and merge last master code. Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj		2011-04-26 18:04:07 +08:00
..
CCPVRTexture.cpp	fixed #418 , add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
CCTexture2D.cpp	TextInputTest compile ok on android and merge last master code.	2011-04-26 18:04:07 +08:00
CCTextureAtlas.cpp	fixed #418 , add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
CCTextureCache.cpp	[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.	2011-04-06 16:29:58 +08:00