6 Commits

Author	SHA1	Message	Date
James Chen	905443d17c	new[] free mismatching after PR #5326.	2014-02-18 10:11:04 +08:00
James Chen	f67f324378	Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 ... Conflicts: cocos/2d/platform/win32/CCImage.cpp	2014-02-17 22:10:45 +08:00
Dhilan007	0d5c702708	move labelttf's platform-dependent code from CCImage to CCDevice	2014-02-13 21:08:43 +08:00
Ricardo Quesada	7da8c84a75	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00