Update CCSpriteFrame.h
translate
translate
translate
translate
Merge pull request #8 from iTyran/v3

update from main Repository
提交有问题的修改
Merge pull request #149 from bruce0505/v3

提交对之前错误的修改
translate CCDataReaderHelper.h’s comment
translate CCDatas.h’s comment
Merge pull request #150 from rainswan/v3

translate CCDataReaderHelper.h’s && CCData.h's comment
翻译
Merge pull request #151 from u0u0/v3

翻译
Update CCSpriteFrame.h
Update CCSpriteFrame.h
Update CCSpriteFrame.h
Merge pull request #152 from daqian/v3

翻译CCSpriteFrame.h
Update CCSpriteFrameCache.h
change encode
Merge branch 'v3' of https://github.com/Carl01Zhang/cocos2d-x into v3

Conflicts:
	cocos/base/CCTouch.h