Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/textures
History
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 		2012-04-15 15:46:01 +08:00
..
CCTexture2D.cpp Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-04-15 15:46:01 +08:00
CCTextureAtlas.cpp fixed #1164: 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad. 2012-04-13 17:24:50 +08:00
CCTextureCache.cpp fixed #1138: Fixed a memory leak in CCTextureCache::addPVRImage. 2012-04-10 18:17:08 +08:00
CCTexturePVR.cpp fix some warning 2011-10-19 15:24:19 +08:00