comparison media-libs/mediastreamer/Manifest @ 437:061dcecdcd1e

resolved merge conflict
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 20 Mar 2017 07:20:37 +0100
parents 79a0505c6421
children 7e560a7c788b
comparison
equal deleted inserted replaced
436:3360705cfae7 437:061dcecdcd1e