5 Commits

Author	SHA1	Message	Date
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
James Chen	12cc6c6153	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt	2013-12-17 15:50:24 +08:00
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +08:00
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00