James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad ... Conflicts: tests/tests/ParticleTest/ParticleTest.cpp		2012-04-09 10:28:21 +08:00
..
CCTexture2D.cpp	return correct content size	2012-04-08 22:37:58 +08:00
CCTextureAtlas.cpp	issue #1094: Make ParticleBatchNode works on win32.	2012-04-07 12:02:40 +08:00
CCTextureCache.cpp	Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.	2012-04-09 09:55:06 +08:00
CCTexturePVR.cpp	fix some warning	2011-10-19 15:24:19 +08:00