Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs ... Conflicts: cocos/2d/CCLabel.cpp		2014-03-26 11:15:48 +08:00
..
LabelTest.cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs	2014-03-26 11:15:48 +08:00
LabelTest.h	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
LabelTestNew.cpp	update test case.	2014-03-25 11:10:48 +08:00
LabelTestNew.h	update test case of issue 4428.	2014-03-18 10:26:45 +08:00