From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 3 Oct 2017 16:20:08 +0000 (+0200)
Subject: Merge branch 'fix_shift_reduce_conflict' of https://github.com/udif/yosys
X-Git-Tag: yosys-0.8~306
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=983479f395ca2edade4d538a225a3426a1fcff38;hp=-c;p=yosys.git

Merge branch 'fix_shift_reduce_conflict' of https://github.com/udif/yosys
---

983479f395ca2edade4d538a225a3426a1fcff38