3 Commits

Author	SHA1	Message	Date
minggo	b9b14571ac	fix compiling erros on Android	2013-11-07 17:16:31 +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