12 Commits

Author	SHA1	Message	Date
minggo	fa7c97171b	fix some warnings	2013-12-06 16:32:06 +08:00
CaiWenzhi	611ba9e9f5	Modify code criterion	2013-11-14 11:37:46 +08:00
CaiWenzhi	1f389d3779	Rename event interface	2013-11-08 18:43:06 +08:00
CaiWenzhi	da27169d45	add "setUserObject" method	2013-11-08 14:58:20 +08:00
CaiWenzhi	18f411fd1e	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch	2013-11-08 11:36:59 +08:00
Ricardo Quesada	ffd4342548	Adds more strings ... and more `override` and fixes some indetentation issues	2013-11-07 12:42:16 -08:00
Ricardo Quesada	e4662b371a	TextField uses std::string& in the public API ... and uses std::string instead of std::string* internally	2013-11-07 11:58:48 -08:00
CaiWenzhi	b0a422eb09	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch	2013-11-07 17:40:13 +08:00
CaiWenzhi	9f2297a5a6	add "retain" to listeners	2013-11-07 16:46:41 +08:00
samuele3	9f5095b9c3	Reslove the compiled error	2013-11-07 16:43:04 +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