5 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
zhangcheng	b86a8271d9	1. Upload Cocostudio Action.	2013-09-17 21:14:45 +08:00
CaiWenzhi	9d6d9dcd19	Add getDescription method	2013-09-17 17:59:20 +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