projects / yosys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4fd7ec 72a08ec)
Merge branch 'fix_shift_reduce_conflict' of https://github.com/udif/yosys
authorClifford Wolf <clifford@clifford.at>
Tue, 3 Oct 2017 16:20:08 +0000 (18:20 +0200)
committerClifford Wolf <clifford@clifford.at>
Tue, 3 Oct 2017 16:20:08 +0000 (18:20 +0200)

Trivial merge