6 Commits

Author	SHA1	Message	Date
boyu0	cecfc13bc4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
boyu0	a2b611d8c3	Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR	2013-07-25 21:35:00 +08:00
minggo	77afae124b	issue #2430:move Texture2D enum into class	2013-07-25 19:52:44 +08:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
James Chen	cb67ed0227	issue #2129: Removing CC prefix for extension module.	2013-06-20 14:15:53 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00