comparison app-crypt/veracrypt/veracrypt-1.16.ebuild @ 437:061dcecdcd1e

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