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
..
Classes	Merge pull request #5679 from Dhilan007/develop_label	2014-03-12 11:17:49 +08:00
Resources	change gui to ui	2014-03-12 10:12:02 +08:00
proj.android	TestsDemo -> CppTests.	2014-03-11 19:10:36 +08:00
proj.ios	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
proj.win32	rename gui to ui	2014-03-12 10:46:49 +08:00
Android.mk	All tests could run on Android.	2014-03-11 19:10:36 +08:00
CMakeLists.txt	Merge branch 'develop' into fix_gui_to_ui	2014-03-12 10:09:09 +08:00