projects / yosys.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71f3afb 7033503)
Merge branch 'master' of https://github.com/YosysHQ/yosys
authorRodrigo Alejandro Melo <rmelo@inti.gob.ar>
Mon, 3 Feb 2020 13:56:11 +0000 (10:56 -0300)
committerRodrigo Alejandro Melo <rmelo@inti.gob.ar>
Mon, 3 Feb 2020 13:56:41 +0000 (10:56 -0300)
commit313a425bd58f1bf0f7f48d86cf0a42a88a93c5dc
treef35f8834f0cc30380c32d5ed3a38cb2673304931tree
parent71f3afb9a26e7bad2a9e9d59877a94cbd757cad4commit | diff
parent7033503cd9e40e16c11fe6c805a436b0e23989ddcommit | diff
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>
CHANGELOG diff1 | diff2 | blob | history
frontends/ast/simplify.cc diff1 | diff2 | blob | history