Sportswear company Puma has settled a deal with football governing body FIFA over Cameroon's one-piece playing strip.