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
..
cpp-empty-test	updates CMakeLists.txt	2014-03-11 19:10:37 +08:00
cpp-tests	Merge pull request #5679 from Dhilan007/develop_label	2014-03-12 11:17:49 +08:00
lua-empty-test	fix linux compile error	2014-03-12 11:03:23 +08:00
lua-tests	fix linux compile error	2014-03-12 11:03:23 +08:00