11 Commits

Author	SHA1	Message	Date
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
Dale Stammen	44e6efea64	#pragma mark for ios and mac only	2014-03-22 06:08:05 -07:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
Ricardo Quesada	f4c68e4eef	More renames of description() to getDescription()	2013-12-12 14:38:12 -08:00
James Chen	be9bb6998b	issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. ... Also renames Map::remove to Map::erase.	2013-12-11 18:08:06 +08:00
boyu0	fb04c9e574	issue #2770: fix some warning	2013-11-13 11:22:34 +08:00
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
samuele3	8c025a2cee	Reslove the linux compiled error	2013-11-07 15:12:19 +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	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00