4 Commits

Author	SHA1	Message	Date
samuele3	e6fd1fece1	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck	2013-11-07 15:28:48 +08:00
Ricardo Quesada	ddb0111392	continue replacing `const char*` with `const std::string&` ... This patch includes: * Continue replacing `const char*` with `const std::string&` where it makes sense. * It also removes some Hungarian notation from the code. * It fixes some indentation issues in part of the code * It replaces `int` or `unsigned int` with `long` where it makes sense.	2013-11-06 17:05:13 -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