The settlement, announced in a joint statement that did not disclose terms, ends more than a year of acrimonious litigation.