Skip to content
GitLab
Commit 44378d25 authored by chick's avatar chick
Browse files

Merge branch 'master' into vec-literals 

# Conflicts:
#	core/src/main/scala/chisel3/Aggregate.scala
#	src/test/scala/chiselTests/ChiselSpec.scala
parents 38392edb c2ba4098
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment