1159 Commits

Author	SHA1	Message	Date
andyque	ca6851f114	fix warnings of font and RichText	2014-03-20 11:58:36 +08:00
andyque	7ae77c9335	fix cocos2dx engine internal warnings	2014-03-20 10:58:04 +08:00
Dhilan007	e512235299	Remove the old implementation of LabelTTF	2014-03-14 21:06:40 +08:00
James Chen	177bf4df9d	Some warning fixes.	2014-03-14 15:38:43 +08:00
CaiWenzhi	b8ce59962a	Fixed bug of ScrollView	2014-03-13 10:11:41 +08:00
CaiWenzhi	4d99736e4a	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00
andyque	448b101578	fix linux compile error	2014-03-11 20:46:11 +08:00
andyque	48772fb952	modify android makefile	2014-03-11 18:48:28 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00