13 Commits

Author	SHA1	Message	Date
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
Dale Stammen	77ab59ebab	#pragma mark for ios and mac only	2014-03-22 05:52:45 -07:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
James Chen	4302f3886d	issue #2789: Adds performance test for Vector and CCArray.	2014-01-17 10:02:12 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
Dhilan007	49d8b76b9e	fix crash related to not support the z length modifier for size_t on vs	2014-01-05 11:59:32 +08:00
boyu0	f16384a105	fix more code with hungarian notation	2013-12-18 18:51:36 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
minggo	ab23b47043	use ssize_t for capacity and index in containers	2013-12-12 14:48:26 +08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00