7 Commits

Author	SHA1	Message	Date
CaiWenzhi	81bdfac795	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
CaiWenzhi	e5b0bbad74	Fixed bugs	2013-12-30 14:40:49 +08:00
James Chen	b17117a1a1	More warning fixes.	2013-12-28 14:34:52 +08:00
CaiWenzhi	a19000b49f	Add samples	2013-12-23 15:35:35 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
CaiWenzhi	9d07b2c1d2	Temp commit	2013-09-17 20:13:23 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00