7 Commits

Author	SHA1	Message	Date
zhangcheng	c065dd2920	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684	2013-09-17 22:41:42 +08:00
CaiWenzhi	1f45bad5e7	Modify guy example	2013-09-17 21:19:04 +08:00
zhangcheng	b86a8271d9	1. Upload Cocostudio Action.	2013-09-17 21:14:45 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00
James Chen	5ee8ad8c4f	Fix compilation errors for CocoGUI.	2013-09-16 17:12:15 +08:00
CaiWenzhi	210af21615	Modify member names	2013-09-16 17:12:15 +08:00
CaiWenzhi	4843046d17	Merge GUI to develop step 1;	2013-09-16 17:12:15 +08:00