cocos2d/cocos2d-x — pull request #6876 by sachingarg05 (2014-05-22 10:24:26+00:00)
Title: Added 'optional' paramater to GLProgramState::setUniformTexture to manually specify textureUnitIndex.

Added 'optional' paramater to GLProgramState::setUniformTexture to manually specify textureUnitIndex.