SatomiAhn/ocupdater — pull request #26 by JoyStipe (2013-03-21 04:25:45+00:00)
Title: Update OpenCollar - texture.lsl

hell I forget what all was changed ... but at least I found the conflict, and I will remove that pull request + redo this one. The other one just happened to also be in this one.