minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage ... issue #2345 refactor CCImage and CCTexture2D		2013-08-06 23:29:38 -07:00
..
Cpp	Merge pull request #3377 from boyu0/iss2345_refactor_ccimage	2013-08-06 23:29:38 -07:00
Javascript	Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357.	2013-08-06 16:27:40 +08:00
Lua	Merge pull request #3377 from boyu0/iss2345_refactor_ccimage	2013-08-06 23:29:38 -07:00
samples.xcodeproj	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00