aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-06-07 16:15:19 -0700
committerEddie Hung <eddie@fpgeh.com>2019-06-07 16:15:19 -0700
commit1e201a9b010badec6f220476dc6bc03a06de5b69 (patch)
treeceff38dbba8d2b63dd6f302949a742ef2061eff3 /CHANGELOG
parentfe4394fb9aacfaee840d2c72b88c5da666fbcb28 (diff)
parent2b350401c4577d54c0d460240e2d2847d2eeadc4 (diff)
downloadyosys-1e201a9b010badec6f220476dc6bc03a06de5b69.tar.gz
yosys-1e201a9b010badec6f220476dc6bc03a06de5b69.tar.bz2
yosys-1e201a9b010badec6f220476dc6bc03a06de5b69.zip
Merge remote-tracking branch 'origin/master' into xc7mux
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e67d9c903..149443c74 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,7 +16,11 @@ Yosys 0.8 .. Yosys 0.8-dev
- Added "gate2lut.v" techmap rule
- Added "rename -src"
- Added "equiv_opt" pass
+<<<<<<< HEAD
- Added "muxpack" pass
+=======
+ - Added "read_aiger" frontend
+>>>>>>> origin/master
- "synth_xilinx" to now infer hard shift registers, using new "shregmap -tech xilinx"