The City of San Antonio and a major airline have ended a legal battle over new airport terminal space that began roughly 20 ...