YuLei Liao 9660bcd165 * merge upstream/master to master		2012-01-20 19:08:21 +08:00
..
CCTexture2D.cpp	fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method	2011-12-20 14:59:15 +08:00
CCTextureAtlas.cpp	…
CCTextureCache.cpp	fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'	2011-12-29 16:00:36 +08:00
CCTexturePVR.cpp	…