YuLei Liao bbad5a4392 * merge upstream/master to master		2011-12-25 11:48:03 +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	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
CCTextureCache.cpp	fixed #911: add some comment	2011-12-22 16:29:25 +08:00
CCTexturePVR.cpp	* merge cocos2d-1.0.1-x-0.9.2-luafix to master	2011-11-21 16:38:00 +08:00