Commit Graph

5 Commits

Author SHA1 Message Date
Dhilan007 93511a878b Remove the old implementation of LabelTTF in test case. 2014-03-26 23:33:58 +08:00
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
James Chen a2d00c8f95 Adds another test for stroke. 2014-03-24 17:39:23 +08:00
James Chen 99b65f0a7c LabelTest , changed stroke color to blue. 2014-03-24 17:05:24 +08:00
James Chen b88de91a15 Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00