godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: cocos2dx/Android.mk cocos2dx/platform/CCImage.h cocos2dx/platform/CCImageCommon_cpp.h cocos2dx/textures/CCTexture2D.h scripting/javascript/bindings/generated		2013-08-08 10:19:09 +08:00
..
etc	Combine CCTextureETC to CCImage and CCTexture2D.	2013-07-26 17:34:44 +08:00
s3tc	update s3tc #3 ,standard of code	2013-08-07 16:39:05 +08:00