James Chen 6baea45db6 Merge pull request #5679 from Dhilan007/develop_label ... issue #4337: Two fixes for new label: 1. Color and opacity can't take effect. 2. The font size passed to new Label didn't consider 'contentScaleFactor'.		2014-03-12 11:17:49 +08:00
..
LabelTest.cpp	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
LabelTest.h	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
LabelTestNew.cpp	Merge pull request #5679 from Dhilan007/develop_label	2014-03-12 11:17:49 +08:00
LabelTestNew.h	Merge branch 'develop' into fix_gui_to_ui	2014-03-12 10:09:09 +08:00