5 Commits

Author	SHA1	Message	Date
Ricardo Quesada	cd0ba6850c	Merge branch 'develop' into constructors_are_protected	2013-11-14 11:57:18 -08:00
CaiWenzhi	611ba9e9f5	Modify code criterion	2013-11-14 11:37:46 +08:00
Ricardo Quesada	d590986e73	Constructors are protected	2013-11-13 15:55:36 -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