4 Commits

Author	SHA1	Message	Date
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00