6 Commits

Author	SHA1	Message	Date
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
CaiWenzhi	81bdfac795	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00