The two companies, who sued each other last April over content use for Time Warner's tablet-device app, have reached an agreement to resolve their legal differences.

As part of the agreement, Time Warner Cable customers will receive Viacom programming — including "Jersey Shore," "The Daily Show With Jon Stewart" and others — through Time Warner's in-home streaming app for tablet devices. Customers will also receive additional Viacom channels, including MTV Hits and MTV Jams. Subscribers in major markets will also be given access to TV Land HD and BET HD.

"Viacom and Time Warner Cable have agreed to resolve their pending litigations. All of Viacom’s programming will now be available to Time Warner Cable subscribers for in-home viewing via internet protocol-enabled devices such as iPads and Time Warner Cable will continue to carry Viacom’s Country Music Television (CMT) programming," a joint statement from the companies issued on Wednesday said. "In reaching the settlement agreement, Time Warner Cable and Viacom were also able to resolve other unrelated business matters to their mutual satisfaction."

Viacom programming will become available to customers via Time Warner's tablet app "over the next several weeks."

Both companies added that nether side "is conceding its original legal position."

Last year, Time Warner agreed to drop Viacom programming from its app, but Viacom sued anyway, arguing that a court order was the only way to prevent the company from re-adding the content to its app. Claiming that Time Warner shouldn't be allowed to "unilaterally change the terms of its contractual relationship," Viacom was asking for $2 million for each alleged violation against its contact with Time Warner.

Time Warner Cable, meanwhile, maintained that that content accessed on its iPad app shouldn't be regarded any differently than what it offers via more traditional methods, and thus they haven't violated their contract with providers.