From: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
Date: Mon, 3 Feb 2020 13:56:11 +0000 (-0300)
Subject: Merge branch 'master' of https://github.com/YosysHQ/yosys
X-Git-Tag: working-ls180~803^2~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=313a425bd58f1bf0f7f48d86cf0a42a88a93c5dc;p=yosys.git

Merge branch 'master' of https://github.com/YosysHQ/yosys

Solved a conflict into the CHANGELOG

Signed-off-by: Rodrigo Alejandro Melo <rmelo@inti.gob.ar>
---

313a425bd58f1bf0f7f48d86cf0a42a88a93c5dc