projects / yosys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61a7ec4 02c0718)
Merge pull request #2257 from antmicro/fix-conflicts
authorclairexen <claire@symbioticeda.com>
Wed, 15 Jul 2020 09:49:09 +0000 (11:49 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Jul 2020 09:49:09 +0000 (11:49 +0200)
Restore #2203 and #2244 and fix parser conflicts


Trivial merge