7 Commits

Author	SHA1	Message	Date
cai wenzhi	683d3c9f14	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-02 19:28:44 +08:00
cai wenzhi	4f90676e92	Add method for editor	2014-03-01 22:34:25 +08:00
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
CaiWenzhi	f33064a2fc	Fixed bug of label	2014-01-17 15:22:59 +08:00
James Chen	26efb4bf5c	long —> ssize_t for some classes.	2014-01-07 18:26:31 +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