8 Commits

Author	SHA1	Message	Date
CaiWenzhi	e2249c8c3f	Fixed crash	2013-11-07 17:15:52 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
James Chen	7dc8aeb156	issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.	2013-10-16 11:19:01 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
Ricardo Quesada	0674948325	Small fixes to comply with C++ best practices ... Small fixes to comply with C++ best practices	2013-09-18 19:38:21 -07:00
zhangcheng	b86a8271d9	1. Upload Cocostudio Action.	2013-09-17 21:14:45 +08:00
James Chen	fe1b11a814	Fixing wrong include.	2013-09-17 11:28:33 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00