James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj		2013-02-28 13:01:45 +08:00
..
CCLabelAtlas.cpp	fixed #1686:finish updating	2013-02-28 11:55:36 +08:00
CCLabelAtlas.h	fixed #1686:finish updating	2013-02-28 11:55:36 +08:00
CCLabelBMFont.cpp	Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize	2013-02-28 13:01:45 +08:00
CCLabelBMFont.h	issue #1686:synchronize CCLabelBMFont.cpp	2013-02-28 10:37:47 +08:00
CCLabelTTF.cpp	Reverted the logic of CCLabelTTF::updateTexture.	2013-01-31 14:26:45 +08:00
CCLabelTTF.h	fixed #1593:remove all deprecated methods expect CCBAnimationManager	2012-12-06 18:51:33 +08:00