4 Commits

Author	SHA1	Message	Date
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
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00