projects / yosys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 036e3f9 592a82c)
Merge remote-tracking branch 'upstream/master'
authorJim Lawson <ucbjrl@berkeley.edu>
Mon, 17 Sep 2018 21:31:57 +0000 (14:31 -0700)
committerJim Lawson <ucbjrl@berkeley.edu>
Mon, 17 Sep 2018 21:31:57 +0000 (14:31 -0700)

Trivial merge