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
..
CCLabelAtlas.cpp	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
CCLabelBMFont.cpp	Initialize m_sString pointer.	2012-04-10 15:24:06 +08:00
CCLabelTTF.cpp	retina for win32	2012-04-11 16:41:12 +08:00