Portland, OR -

Pendleton Woolen Mills has settled its trademark infringement lawsuit against the volunteer group that puts on the annual Pendleton Round-Up rodeo.

The  Oregonian reports that attorneys for the Pendleton Round-Up Association filed notice Tuesday in U.S. District Court in Portland that they reached a settlement.

Details were not released, but Round-Up Association spokesman Randy Thomas says they include guidelines for the two organizations to co-exist in harmony for many years to come.

The lawsuit was triggered by the Round-Up Association putting its trademark on a men's fragrance, called "Let `er Buck vintage cologne spray."

A judge gave lawyers for the two sides until Oct. 17 to submit details of the agreement.